canopycms 0.0.68-int.111 → 0.0.68-int.113

package/dist/branch-health.js

@@ -45,15 +45,17 @@ async function readMetaMtime(branchRoot) {
 }
 /**
  * Scan a healthy branch's content tree for duplicate embedded IDs, giving up
- * at `deadline` (epoch ms). Never throws: one branch's unreadable content tree
+ * when `budget` runs out. Never throws: one branch's unreadable content tree
  * must not take down the whole health scan. Costs a full recursive readdir, so
  * it runs only on request and under a budget. A readdir cannot be cancelled: a
  * scan that misses the deadline keeps running unobserved until it settles.
  */
-async function scanDuplicateContentIds(branchRoot, contentRootName, deadline) {
-    const remainingMs = deadline - Date.now();
-    if (remainingMs <= 0)
+async function scanDuplicateContentIds(branchRoot, contentRootName, budget) {
+    const remainingMs = budget.deadline - Date.now();
+    if (budget.spent || remainingMs <= 0) {
+        budget.spent = true;
         return { state: 'unknown', reason: 'out-of-time' };
+    }
     const scan = (async () => {
         try {
             const idIndex = new ContentIdIndex(branchRoot);
@@ -67,7 +69,10 @@ async function scanDuplicateContentIds(branchRoot, contentRootName, deadline) {
     })();
     let timer;
     const outOfTime = new Promise((resolve) => {
-        timer = setTimeout(() => resolve({ state: 'unknown', reason: 'out-of-time' }), remainingMs);
+        timer = setTimeout(() => {
+            budget.spent = true;
+            resolve({ state: 'unknown', reason: 'out-of-time' });
+        }, remainingMs);
     });
     try {
         return await Promise.race([scan, outOfTime]);
@@ -88,8 +93,8 @@ async function scanDuplicateContentIds(branchRoot, contentRootName, deadline) {
  * reached after the budget is spent reports `unknown`/`out-of-time`.
  */
 export async function scanBranchHealth(baseRoot, opts) {
-    const duplicateScanDeadline = opts.duplicateIdScan
-        ? Date.now() + opts.duplicateIdScan.budgetMs
+    const duplicateScanBudget = opts.duplicateIdScan
+        ? { deadline: Date.now() + opts.duplicateIdScan.budgetMs, spent: false }
         : undefined;
     const resolvedRoot = path.resolve(baseRoot);
     const sanitizedBaseBranchName = sanitizeBranchName(opts.baseBranchName);
@@ -154,9 +159,9 @@ export async function scanBranchHealth(baseRoot, opts) {
         }
         if (meta) {
             const [duplicateIdScan, rebaseInProgress] = await Promise.all([
-                duplicateScanDeadline === undefined
+                duplicateScanBudget === undefined
                     ? undefined
-                    : scanDuplicateContentIds(branchRoot, contentRootName, duplicateScanDeadline),
+                    : scanDuplicateContentIds(branchRoot, contentRootName, duplicateScanBudget),
                 isRebaseInProgress(branchRoot),
             ]);
             entries.push({

package/dist/cli/cli.js

@@ -22,6 +22,8 @@ function getErrorMessage(err2) {
 function redactCredentials(message) {
   let result = message;
   result = result.replace(/(:\/\/)[^/\s@]+@/g, "$1***@");
+  result = result.replace(/(\bauthorization\s*:\s*(?:basic|bearer|token)\s+)[A-Za-z0-9+/=._~-]+/gi, "$1***");
+  result = result.replace(/eC1hY2Nlc3MtdG9rZW46[A-Za-z0-9+/]*={0,2}/g, "***");
   result = result.replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{8,}/g, "***");
   result = result.replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{8,}/g, "$1***");
   result = result.replace(/-----BEGIN [A-Z]{0,9} ?PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z]{0,9} ?PRIVATE KEY-----|$)/g, "<private-key>");
@@ -3233,6 +3235,8 @@ function getErrorMessage3(err2) {
 function redactCredentials2(message) {
   let result = message;
   result = result.replace(/(:\/\/)[^/\s@]+@/g, "$1***@");
+  result = result.replace(/(\bauthorization\s*:\s*(?:basic|bearer|token)\s+)[A-Za-z0-9+/=._~-]+/gi, "$1***");
+  result = result.replace(/eC1hY2Nlc3MtdG9rZW46[A-Za-z0-9+/]*={0,2}/g, "***");
   result = result.replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{8,}/g, "***");
   result = result.replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{8,}/g, "$1***");
   result = result.replace(/-----BEGIN [A-Z]{0,9} ?PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z]{0,9} ?PRIVATE KEY-----|$)/g, "<private-key>");

package/dist/cli/generate-ai-content.js

@@ -21,6 +21,8 @@ function getErrorMessage(err) {
 function redactCredentials(message) {
   let result = message;
   result = result.replace(/(:\/\/)[^/\s@]+@/g, "$1***@");
+  result = result.replace(/(\bauthorization\s*:\s*(?:basic|bearer|token)\s+)[A-Za-z0-9+/=._~-]+/gi, "$1***");
+  result = result.replace(/eC1hY2Nlc3MtdG9rZW46[A-Za-z0-9+/]*={0,2}/g, "***");
   result = result.replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{8,}/g, "***");
   result = result.replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{8,}/g, "$1***");
   result = result.replace(/-----BEGIN [A-Z]{0,9} ?PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z]{0,9} ?PRIVATE KEY-----|$)/g, "<private-key>");

package/dist/editor/Editor.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, useRef } from 'react';
-import { ActionIcon, Alert, Box, Drawer, Group, Menu, Paper, Text, Title, } from '@mantine/core';
+import { ActionIcon, Alert, Box, Drawer, Group, Menu, Paper, Text } from '@mantine/core';
 import { IconChevronDown, IconChevronUp, IconDots, IconFolderPlus, IconPlus, } from '@tabler/icons-react';
 import { notifications } from '@mantine/notifications';
 const noop = () => { };
@@ -773,7 +773,7 @@ const EditorContent = ({ entries, title, subtitle, siteTitle = title, siteSubtit
                                 handleRequestChanges(name).catch((err) => console.error(err));
                             }, onDelete: (name) => {
                                 handleDelete(name).catch((err) => console.error(err));
-                            }, onClose: () => setBranchManagerOpen(false), comments: comments, currentUserId: currentUser, canResolve: canResolveComments, onAddComment: handleAddComment, onResolveThread: handleResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: handleGetUserMetadata }) }), commentsPanelOpen && branchNameState && (_jsx(CommentsPanel, { branchName: branchNameState, comments: comments, canResolve: true, onAddComment: handleAddComment, onResolveThread: handleResolveThread, onClose: () => setCommentsPanelOpen(false), onJumpToField: handleJumpToField, onGetUserMetadata: handleGetUserMetadata, onJumpToEntry: handleJumpToEntry, onJumpToBranch: handleJumpToBranch })), _jsx(Drawer, { opened: groupManagerOpen, onClose: () => setGroupManagerOpen(false), position: "right", title: _jsxs("div", { children: [_jsx(Title, { order: 4, children: "Groups" }), _jsx(Text, { size: "xs", c: "dimmed", children: "Manage groups and organizations" })] }), padding: "md", size: 600, overlayProps: { blur: 2 }, children: _jsx(GroupManager, { internalGroups: groupsData, loading: groupsLoading, canEdit: true, onSave: handleSaveGroups, onSearchUsers: handleSearchUsers, onGetUserMetadata: handleGetUserMetadata, onSearchExternalGroups: handleSearchExternalGroups, onClose: () => setGroupManagerOpen(false) }) }), _jsx(Drawer, { opened: permissionManagerOpen, onClose: () => setPermissionManagerOpen(false), position: "right", title: _jsxs("div", { children: [_jsx(Title, { order: 4, children: "Permissions" }), _jsx(Text, { size: "xs", c: "dimmed", children: "Manage content access by path (read, edit, review)" })] }), padding: "md", size: 700, overlayProps: { blur: 2 }, children: _jsx(PermissionManager, { collections: activeCollections, contentRoot: contentRoot, permissions: permissionsData, loading: permissionsLoading, canEdit: true, onSave: handleSavePermissions, onSearchUsers: handleSearchUsers, onGetUserMetadata: handleGetUserMetadata, onListGroups: handleListGroups, onClose: () => setPermissionManagerOpen(false) }) }), showSystemHealth && (_jsx(SystemHealthPanel, { opened: systemHealthOpen, onClose: () => setSystemHealthOpen(false) })), _jsx(MediaLibrary, { opened: mediaLibraryOpen, onClose: () => setMediaLibraryOpen(false), mode: "manage" }), _jsx(CollectionEditor, { isOpen: collectionEditorOpen, editingCollection: editingCollection, parentPath: collectionEditorParentPath, availableSchemas: availableSchemas, onSave: handleCollectionSave, onAddEntryType: editingCollection ? (path, entryType) => addEntryType(path, entryType) : undefined, onUpdateEntryType: editingCollection
+                            }, onClose: () => setBranchManagerOpen(false), comments: comments, currentUserId: currentUser, canResolve: canResolveComments, onAddComment: handleAddComment, onResolveThread: handleResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: handleGetUserMetadata }) }), commentsPanelOpen && branchNameState && (_jsx(CommentsPanel, { branchName: branchNameState, comments: comments, canResolve: true, onAddComment: handleAddComment, onResolveThread: handleResolveThread, onClose: () => setCommentsPanelOpen(false), onJumpToField: handleJumpToField, onGetUserMetadata: handleGetUserMetadata, onJumpToEntry: handleJumpToEntry, onJumpToBranch: handleJumpToBranch })), _jsx(GroupManager, { opened: groupManagerOpen, onClose: () => setGroupManagerOpen(false), internalGroups: groupsData, loading: groupsLoading, canEdit: true, onSave: handleSaveGroups, onSearchUsers: handleSearchUsers, onGetUserMetadata: handleGetUserMetadata, onSearchExternalGroups: handleSearchExternalGroups }), _jsx(PermissionManager, { opened: permissionManagerOpen, onClose: () => setPermissionManagerOpen(false), collections: activeCollections, contentRoot: contentRoot, permissions: permissionsData, loading: permissionsLoading, canEdit: true, onSave: handleSavePermissions, onSearchUsers: handleSearchUsers, onGetUserMetadata: handleGetUserMetadata, onListGroups: handleListGroups }), showSystemHealth && (_jsx(SystemHealthPanel, { opened: systemHealthOpen, onClose: () => setSystemHealthOpen(false) })), _jsx(MediaLibrary, { opened: mediaLibraryOpen, onClose: () => setMediaLibraryOpen(false), mode: "manage" }), _jsx(CollectionEditor, { isOpen: collectionEditorOpen, editingCollection: editingCollection, parentPath: collectionEditorParentPath, availableSchemas: availableSchemas, onSave: handleCollectionSave, onAddEntryType: editingCollection ? (path, entryType) => addEntryType(path, entryType) : undefined, onUpdateEntryType: editingCollection
                             ? (path, name, updates) => updateEntryType(path, name, updates)
                             : undefined, onRemoveEntryType: editingCollection ? (path, name) => removeEntryType(path, name) : undefined, onClose: handleCloseCollectionEditor, isSaving: schemaLoading, error: collectionEditorError }), renamingEntry && (_jsx(RenameEntryModal, { isOpen: renameModalOpen, entryLabel: renamingEntry.label, currentSlug: renamingEntry.slug || '', onSave: handleRenameSubmit, onClose: () => {
                             setRenameModalOpen(false);

package/dist/editor/components/StagedChangesDrawer.d.ts

@@ -0,0 +1,37 @@
+import React from 'react';
+export interface StagedChangesDrawerProps {
+    opened: boolean;
+    /** Closes the drawer. Called directly when clean, only after a confirmed discard when dirty, and never while saving. */
+    onClose: () => void;
+    title: string;
+    description: string;
+    size: number;
+    isDirty: boolean;
+    isSaving: boolean;
+    /** Whether the viewer may save; without it the save bar never renders. */
+    canEdit: boolean;
+    saveLabel: string;
+    onSave: () => void;
+    onDiscard: () => void;
+    /** A modal of the panel's own is open: the drawer yields Escape to it (Mantine listens for Escape on window, capture phase). */
+    childModalOpen?: boolean;
+    /** Runs once the close transition has finished; see `useOpeningKey`. */
+    onExited?: () => void;
+    children: React.ReactNode;
+}
+/**
+ * A key that changes each time the drawer finishes closing. A panel keyed with it, and passing
+ * `onExited` through, gets fresh state for each opening, as the drawer's own children do. A
+ * reopen during the close transition cancels it, so that opening keeps the previous state.
+ */
+export declare function useOpeningKey(): {
+    key: number;
+    onExited: () => void;
+};
+/**
+ * The drawer shell for an admin panel that stages edits and saves them as one batch
+ * (groups, permissions). Staged edits exist only in the panel's state, so the shell keeps
+ * them from being lost unnoticed: a title badge and a sticky save bar while dirty, a
+ * discard confirm on close, and a `beforeunload` prompt.
+ */
+export declare const StagedChangesDrawer: React.FC<StagedChangesDrawerProps>;

package/dist/editor/components/StagedChangesDrawer.js

@@ -0,0 +1,75 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useCallback, useEffect, useReducer, useRef } from 'react';
+import { Badge, Button, Drawer, Fieldset, Group, Text, Title } from '@mantine/core';
+import { modals } from '@mantine/modals';
+/**
+ * A key that changes each time the drawer finishes closing. A panel keyed with it, and passing
+ * `onExited` through, gets fresh state for each opening, as the drawer's own children do. A
+ * reopen during the close transition cancels it, so that opening keeps the previous state.
+ */
+export function useOpeningKey() {
+    const [key, onExited] = useReducer((n) => n + 1, 0);
+    return { key, onExited };
+}
+/** Asks the browser to confirm a reload or navigation, for exactly as long as `isDirty` holds. */
+function useBeforeUnloadWhileDirty(isDirty) {
+    useEffect(() => {
+        if (!isDirty)
+            return;
+        const handler = (event) => {
+            event.preventDefault();
+            // Chrome before 119 shows the prompt only when returnValue is set.
+            event.returnValue = '';
+        };
+        window.addEventListener('beforeunload', handler);
+        return () => window.removeEventListener('beforeunload', handler);
+    }, [isDirty]);
+}
+/**
+ * The drawer shell for an admin panel that stages edits and saves them as one batch
+ * (groups, permissions). Staged edits exist only in the panel's state, so the shell keeps
+ * them from being lost unnoticed: a title badge and a sticky save bar while dirty, a
+ * discard confirm on close, and a `beforeunload` prompt.
+ */
+export const StagedChangesDrawer = ({ opened, onClose, title, description, size, isDirty, isSaving, canEdit, saveLabel, onSave, onDiscard, childModalOpen = false, onExited, children, }) => {
+    // A ref, not state: @mantine/modals runs the confirm's onClose inside its reducer, during
+    // render, where setting another component's state draws a React warning. While the confirm is open the
+    // drawer still hears Escape, so requestClose must ignore it.
+    const confirmOpenRef = useRef(false);
+    useBeforeUnloadWhileDirty(isDirty);
+    const requestClose = useCallback(() => {
+        // The save is already on its way to the server; discarding now could not stop it.
+        if (isSaving || confirmOpenRef.current)
+            return;
+        if (!isDirty) {
+            onClose();
+            return;
+        }
+        confirmOpenRef.current = true;
+        modals.openConfirmModal({
+            title: 'Discard unsaved changes?',
+            children: _jsx(Text, { size: "sm", children: "Closing now drops the changes you have not saved." }),
+            labels: { confirm: 'Discard', cancel: 'Keep editing' },
+            confirmProps: { color: 'red' },
+            onConfirm: () => {
+                onDiscard();
+                onClose();
+            },
+            // Mantine calls onClose for every exit, the confirm included.
+            onClose: () => {
+                confirmOpenRef.current = false;
+            },
+        });
+    }, [isDirty, isSaving, onClose, onDiscard]);
+    return (_jsxs(Drawer, { opened: opened, onClose: requestClose, closeOnEscape: !childModalOpen, onExitTransitionEnd: onExited, position: "right", title: _jsxs("div", { children: [_jsxs(Group, { gap: "xs", children: [_jsx(Title, { order: 4, children: title }), isDirty && (_jsx(Badge, { color: "orange", variant: "light", children: "Unsaved changes" }))] }), _jsx(Text, { size: "xs", c: "dimmed", children: description })] }), padding: "md", size: size, overlayProps: { blur: 2 }, children: [_jsx(Fieldset, { variant: "unstyled", disabled: isSaving, "aria-busy": isSaving, children: children }), canEdit && isDirty && (
+            // The drawer's content box is the scroll container, so a sticky bar stays in view
+            // however long the panel's list grows.
+            _jsxs(Group, { justify: "space-between", py: "sm", gap: "sm", style: {
+                    position: 'sticky',
+                    bottom: 0,
+                    zIndex: 1,
+                    background: 'var(--mantine-color-body)',
+                    borderTop: '1px solid var(--mantine-color-gray-3)',
+                }, children: [_jsx(Text, { size: "sm", c: "dimmed", children: "Changes take effect only after you save." }), _jsxs(Group, { gap: "sm", children: [_jsx(Button, { variant: "subtle", color: "neutral", onClick: onDiscard, disabled: isSaving, children: "Discard Changes" }), _jsx(Button, { onClick: onSave, loading: isSaving, disabled: isSaving, children: saveLabel })] })] }))] }));
+};

package/dist/editor/group-manager/GroupCard.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 import type { InternalGroup, UserSearchResult, CanopyGroupId, CanopyUserId } from './types.js';
 export interface GroupCardProps {
     group: InternalGroup;
+    /** The group is new or edited and its change is staged, not saved. */
+    isUnsaved: boolean;
     onEdit: (group: InternalGroup) => void;
     onDelete: (groupId: CanopyGroupId) => void;
     onAddMember: (groupId: CanopyGroupId, userId: CanopyUserId) => void;

package/dist/editor/group-manager/GroupCard.js

@@ -3,6 +3,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ActionIcon, Badge, Group, Paper, Text, Tooltip } from '@mantine/core';
 import { IconEdit, IconTrash } from '@tabler/icons-react';
 import { MemberList } from './MemberList.js';
-export const GroupCard = ({ group, onEdit, onDelete, onAddMember, onRemoveMember, onGetUserMetadata, showUserSearch, searchQuery, searchResults, isSearching, searchError, onSearchQueryChange, onShowSearch, onHideSearch, canSearch, }) => {
-    return (_jsxs(Paper, { withBorder: true, p: "sm", mb: "xs", children: [_jsxs(Group, { justify: "space-between", mb: "sm", children: [_jsxs("div", { style: { flex: 1 }, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { size: "sm", fw: 500, children: group.name }), _jsxs(Badge, { size: "sm", variant: "light", children: [group.members?.length || 0, " members"] })] }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["ID: ", group.id] }), group.description && (_jsx(Text, { size: "xs", c: "dimmed", mt: 4, children: group.description }))] }), _jsxs(Group, { gap: "xs", children: [_jsx(Tooltip, { label: "Edit group", children: _jsx(ActionIcon, { size: "sm", variant: "subtle", onClick: () => onEdit(group), children: _jsx(IconEdit, { size: 16 }) }) }), _jsx(Tooltip, { label: "Delete group", children: _jsx(ActionIcon, { size: "sm", variant: "subtle", color: "red", onClick: () => onDelete(group.id), children: _jsx(IconTrash, { size: 16 }) }) })] })] }), _jsx(MemberList, { groupId: group.id, members: group.members || [], onRemoveMember: onRemoveMember, onAddMember: onAddMember, onGetUserMetadata: onGetUserMetadata, showUserSearch: showUserSearch, searchQuery: searchQuery, searchResults: searchResults, isSearching: isSearching, searchError: searchError, onSearchQueryChange: onSearchQueryChange, onShowSearch: onShowSearch, onHideSearch: onHideSearch, canSearch: canSearch })] }));
+export const GroupCard = ({ group, isUnsaved, onEdit, onDelete, onAddMember, onRemoveMember, onGetUserMetadata, showUserSearch, searchQuery, searchResults, isSearching, searchError, onSearchQueryChange, onShowSearch, onHideSearch, canSearch, }) => {
+    return (_jsxs(Paper, { withBorder: true, p: "sm", mb: "xs", children: [_jsxs(Group, { justify: "space-between", mb: "sm", children: [_jsxs("div", { style: { flex: 1 }, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { size: "sm", fw: 500, children: group.name }), _jsxs(Badge, { size: "sm", variant: "light", children: [group.members?.length || 0, " members"] }), isUnsaved && (_jsx(Badge, { size: "sm", variant: "light", color: "orange", children: "Unsaved" }))] }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["ID: ", group.id] }), group.description && (_jsx(Text, { size: "xs", c: "dimmed", mt: 4, children: group.description }))] }), _jsxs(Group, { gap: "xs", children: [_jsx(Tooltip, { label: "Edit group", children: _jsx(ActionIcon, { size: "sm", variant: "subtle", onClick: () => onEdit(group), children: _jsx(IconEdit, { size: 16 }) }) }), _jsx(Tooltip, { label: "Delete group", children: _jsx(ActionIcon, { size: "sm", variant: "subtle", color: "red", onClick: () => onDelete(group.id), children: _jsx(IconTrash, { size: 16 }) }) })] })] }), _jsx(MemberList, { groupId: group.id, members: group.members || [], onRemoveMember: onRemoveMember, onAddMember: onAddMember, onGetUserMetadata: onGetUserMetadata, showUserSearch: showUserSearch, searchQuery: searchQuery, searchResults: searchResults, isSearching: isSearching, searchError: searchError, onSearchQueryChange: onSearchQueryChange, onShowSearch: onShowSearch, onHideSearch: onHideSearch, canSearch: canSearch })] }));
 };

package/dist/editor/group-manager/GroupForm.js

@@ -2,5 +2,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, Group, Modal, Paper, Stack, Text, TextInput, Textarea } from '@mantine/core';
 export const GroupForm = ({ isOpen, editingGroup, formData, onFormChange, onSave, onClose, }) => {
-    return (_jsx(Modal, { opened: isOpen, onClose: onClose, title: editingGroup ? 'Edit Group' : 'Create Group', children: _jsxs(Stack, { gap: "md", children: [editingGroup && (_jsxs("div", { children: [_jsx(Text, { size: "sm", fw: 500, mb: 4, children: "ID (system-generated)" }), _jsx(Paper, { p: "xs", withBorder: true, bg: "gray.0", children: _jsx(Text, { size: "sm", ff: "monospace", c: "dimmed", children: editingGroup.id }) })] })), _jsx(TextInput, { label: "Group Name", placeholder: "e.g., Content Editors", value: formData.name, onChange: (e) => onFormChange({ name: e.target.value }), required: true }), _jsx(Textarea, { label: "Description", placeholder: "Optional description", value: formData.description, onChange: (e) => onFormChange({ description: e.target.value }), rows: 3 }), _jsxs(Group, { justify: "flex-end", gap: "sm", children: [_jsx(Button, { variant: "subtle", onClick: onClose, children: "Cancel" }), _jsx(Button, { onClick: onSave, children: editingGroup ? 'Save' : 'Create' })] })] }) }));
+    return (_jsx(Modal, { opened: isOpen, onClose: onClose, title: editingGroup ? 'Edit Group' : 'Create Group', children: _jsxs(Stack, { gap: "md", children: [editingGroup && (_jsxs("div", { children: [_jsx(Text, { size: "sm", fw: 500, mb: 4, children: "ID (system-generated)" }), _jsx(Paper, { p: "xs", withBorder: true, bg: "gray.0", children: _jsx(Text, { size: "sm", ff: "monospace", c: "dimmed", children: editingGroup.id }) })] })), _jsx(TextInput, { label: "Group Name", placeholder: "e.g., Content Editors", value: formData.name, onChange: (e) => onFormChange({ name: e.target.value }), required: true }), _jsx(Textarea, { label: "Description", placeholder: "Optional description", value: formData.description, onChange: (e) => onFormChange({ description: e.target.value }), rows: 3 }), _jsxs(Group, { justify: "flex-end", gap: "sm", children: [_jsx(Button, { variant: "subtle", onClick: onClose, children: "Cancel" }), _jsx(Button, { onClick: onSave, children: editingGroup ? 'Apply' : 'Add' })] })] }) }));
 };

package/dist/editor/group-manager/InternalGroupsTab.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import type { InternalGroup, UserSearchResult, CanopyGroupId, CanopyUserId } from './types.js';
 export interface InternalGroupsTabProps {
     groups: InternalGroup[];
+    unsavedGroupIds: ReadonlySet<CanopyGroupId>;
     canEdit: boolean;
     onCreateGroup: () => void;
     onEditGroup: (group: InternalGroup) => void;

package/dist/editor/group-manager/InternalGroupsTab.js

@@ -3,7 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, Group, Paper, ScrollArea, Stack, Text } from '@mantine/core';
 import { IconPlus, IconUsers } from '@tabler/icons-react';
 import { GroupCard } from './GroupCard.js';
-export const InternalGroupsTab = ({ groups, canEdit, onCreateGroup, onEditGroup, onDeleteGroup, onAddMember, onRemoveMember, onGetUserMetadata, activeSearchGroupId, searchQuery, searchResults, isSearching, searchError, onSearchQueryChange, onShowSearch, onHideSearch, canSearch, }) => {
+export const InternalGroupsTab = ({ groups, unsavedGroupIds, canEdit, onCreateGroup, onEditGroup, onDeleteGroup, onAddMember, onRemoveMember, onGetUserMetadata, activeSearchGroupId, searchQuery, searchResults, isSearching, searchError, onSearchQueryChange, onShowSearch, onHideSearch, canSearch, }) => {
     if (!canEdit) {
         return (_jsx("div", { style: {
                 flex: 1,
@@ -11,5 +11,5 @@ export const InternalGroupsTab = ({ groups, canEdit, onCreateGroup, onEditGroup,
                 paddingTop: 'var(--mantine-spacing-md)',
             }, children: groups.length === 0 ? (_jsxs(Paper, { withBorder: true, p: "md", style: { textAlign: 'center' }, children: [_jsx(IconUsers, { size: 32, color: "gray", style: { margin: '0 auto', marginBottom: 8 } }), _jsx(Text, { size: "sm", c: "dimmed", children: "No internal groups" })] })) : (_jsx(Stack, { gap: "xs", pb: "md", children: groups.map((group) => (_jsx(Paper, { withBorder: true, p: "sm", children: _jsxs(Group, { justify: "space-between", children: [_jsxs("div", { children: [_jsx(Text, { size: "sm", fw: 500, children: group.name }), group.description && (_jsx(Text, { size: "xs", c: "dimmed", children: group.description }))] }), _jsxs(Text, { size: "sm", variant: "light", children: [group.members?.length || 0, " members"] })] }) }, group.id))) })) }));
     }
-    return (_jsx(ScrollArea, { style: { height: '100%' }, pt: "md", children: _jsxs(Stack, { gap: "sm", pb: "md", children: [_jsxs(Group, { justify: "space-between", mb: "xs", children: [_jsx(Text, { size: "sm", fw: 500, c: "dimmed", children: "Manage your internal groups" }), _jsx(Button, { size: "xs", variant: "light", leftSection: _jsx(IconPlus, { size: 14 }), onClick: onCreateGroup, children: "Create Group" })] }), groups.length === 0 ? (_jsxs(Paper, { withBorder: true, p: "md", style: { textAlign: 'center' }, children: [_jsx(IconUsers, { size: 32, color: "gray", style: { margin: '0 auto', marginBottom: 8 } }), _jsx(Text, { size: "sm", c: "dimmed", children: "No internal groups yet. Create one to get started." })] })) : (groups.map((group) => (_jsx(GroupCard, { group: group, onEdit: onEditGroup, onDelete: onDeleteGroup, onAddMember: onAddMember, onRemoveMember: onRemoveMember, onGetUserMetadata: onGetUserMetadata, showUserSearch: activeSearchGroupId === group.id, searchQuery: searchQuery, searchResults: searchResults, isSearching: isSearching, searchError: searchError, onSearchQueryChange: onSearchQueryChange, onShowSearch: () => onShowSearch(group.id), onHideSearch: onHideSearch, canSearch: canSearch }, group.id))))] }) }));
+    return (_jsx(ScrollArea, { style: { height: '100%' }, pt: "md", children: _jsxs(Stack, { gap: "sm", pb: "md", children: [_jsxs(Group, { justify: "space-between", mb: "xs", children: [_jsx(Text, { size: "sm", fw: 500, c: "dimmed", children: "Manage your internal groups" }), _jsx(Button, { size: "xs", variant: "light", leftSection: _jsx(IconPlus, { size: 14 }), onClick: onCreateGroup, children: "Create Group" })] }), groups.length === 0 ? (_jsxs(Paper, { withBorder: true, p: "md", style: { textAlign: 'center' }, children: [_jsx(IconUsers, { size: 32, color: "gray", style: { margin: '0 auto', marginBottom: 8 } }), _jsx(Text, { size: "sm", c: "dimmed", children: "No internal groups yet. Create one to get started." })] })) : (groups.map((group) => (_jsx(GroupCard, { group: group, isUnsaved: unsavedGroupIds.has(group.id), onEdit: onEditGroup, onDelete: onDeleteGroup, onAddMember: onAddMember, onRemoveMember: onRemoveMember, onGetUserMetadata: onGetUserMetadata, showUserSearch: activeSearchGroupId === group.id, searchQuery: searchQuery, searchResults: searchResults, isSearching: isSearching, searchError: searchError, onSearchQueryChange: onSearchQueryChange, onShowSearch: () => onShowSearch(group.id), onHideSearch: onHideSearch, canSearch: canSearch }, group.id))))] }) }));
 };

package/dist/editor/group-manager/hooks/useGroupState.d.ts

@@ -5,6 +5,8 @@ export interface UseGroupStateOptions {
 }
 export interface UseGroupStateResult {
     groups: InternalGroup[];
+    /** Listed groups that are new or differ from the last loaded or saved state. */
+    unsavedGroupIds: ReadonlySet<CanopyGroupId>;
     isDirty: boolean;
     isSaving: boolean;
     error: string | null;

package/dist/editor/group-manager/hooks/useGroupState.js

@@ -1,6 +1,10 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useMemo } from 'react';
 const TEMP_GROUP_ID_PREFIX = 'temp-';
 const isTempGroupId = (id) => id.startsWith(TEMP_GROUP_ID_PREFIX);
+const sameMembers = (a = [], b = []) => a.length === b.length && [...a].sort().join('\n') === [...b].sort().join('\n');
+const sameGroup = (a, b) => a.name === b.name &&
+    (a.description ?? '') === (b.description ?? '') &&
+    sameMembers(a.members, b.members);
 export function useGroupState({ initialGroups, onSave, }) {
     const [groups, setGroups] = useState(initialGroups);
     const [isDirty, setIsDirty] = useState(false);
@@ -10,6 +14,18 @@ export function useGroupState({ initialGroups, onSave, }) {
         setGroups(initialGroups);
         setIsDirty(false);
     }, [initialGroups]);
+    // Only while dirty: after a save whose reload failed, initialGroups is stale.
+    const unsavedGroupIds = useMemo(() => {
+        if (!isDirty)
+            return new Set();
+        const initialById = new Map(initialGroups.map((g) => [g.id, g]));
+        return new Set(groups
+            .filter((g) => {
+            const initial = initialById.get(g.id);
+            return !initial || !sameGroup(g, initial);
+        })
+            .map((g) => g.id));
+    }, [groups, initialGroups, isDirty]);
     const createGroup = useCallback((name, description) => {
         const newGroup = {
             id: `${TEMP_GROUP_ID_PREFIX}${crypto.randomUUID()}`,
@@ -79,6 +95,7 @@ export function useGroupState({ initialGroups, onSave, }) {
     }, [initialGroups]);
     return {
         groups,
+        unsavedGroupIds,
         isDirty,
         isSaving,
         error,

package/dist/editor/group-manager/index.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback } from 'react';
-import { Alert, Button, Group, Loader, Stack, Tabs, Text } from '@mantine/core';
+import { Alert, Group, Loader, Stack, Tabs, Text } from '@mantine/core';
 import { IconAlertCircle } from '@tabler/icons-react';
 import { useGroupState } from './hooks/useGroupState.js';
 import { useUserSearch } from './hooks/useUserSearch.js';
@@ -9,8 +9,13 @@ import { useExternalGroupSearch } from './hooks/useExternalGroupSearch.js';
 import { InternalGroupsTab } from './InternalGroupsTab.js';
 import { ExternalGroupsTab } from './ExternalGroupsTab.js';
 import { GroupForm } from './GroupForm.js';
-export const GroupManager = ({ internalGroups: initialInternalGroups, loading = false, canEdit, onSave, onSearchUsers, onGetUserMetadata, onSearchExternalGroups, onClose: _, }) => {
-    const { groups, isDirty, isSaving, error, setError, createGroup, updateGroup, deleteGroup, addMember, removeMember, save, discard, } = useGroupState({
+import { StagedChangesDrawer, useOpeningKey } from '../components/StagedChangesDrawer.js';
+export const GroupManager = (props) => {
+    const { key, onExited } = useOpeningKey();
+    return _jsx(GroupManagerDrawer, { ...props, onExited: onExited }, key);
+};
+const GroupManagerDrawer = ({ opened, onClose, onExited, internalGroups: initialInternalGroups, loading = false, canEdit, onSave, onSearchUsers, onGetUserMetadata, onSearchExternalGroups, }) => {
+    const { groups, unsavedGroupIds, isDirty, isSaving, error, setError, createGroup, updateGroup, deleteGroup, addMember, removeMember, save, discard, } = useGroupState({
         initialGroups: initialInternalGroups,
         onSave,
     });
@@ -53,7 +58,7 @@ export const GroupManager = ({ internalGroups: initialInternalGroups, loading =
         addMember(groupId, userId);
         userSearch.hideSearch();
     }, [addMember, userSearch]);
-    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, children: [!canEdit && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "yellow", mb: "sm", title: "Read-only", children: "You need admin access to manage groups." })), error && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "red", mb: "sm", title: "Error", withCloseButton: true, onClose: () => setError(null), children: error })), loading ? (_jsxs(Group, { justify: "center", py: "xl", children: [_jsx(Loader, { size: "md" }), _jsx(Text, { size: "sm", c: "dimmed", children: "Loading groups..." })] })) : (_jsxs(Tabs, { defaultValue: "internal", style: { flex: 1, display: 'flex', flexDirection: 'column' }, children: [_jsxs(Tabs.List, { children: [_jsx(Tabs.Tab, { value: "internal", children: "Internal Groups" }), _jsx(Tabs.Tab, { value: "external", children: "External Groups" })] }), _jsx(Tabs.Panel, { value: "internal", style: { flex: 1, overflow: 'auto' }, children: _jsx(InternalGroupsTab, { groups: groups, canEdit: canEdit, onCreateGroup: handleCreateGroup, onEditGroup: handleEditGroup, onDeleteGroup: deleteGroup, onAddMember: handleAddMember, onRemoveMember: removeMember, onGetUserMetadata: onGetUserMetadata, activeSearchGroupId: userSearch.activeGroupId, searchQuery: userSearch.searchQuery, searchResults: userSearch.searchResults, isSearching: userSearch.isSearching, searchError: userSearch.searchError, onSearchQueryChange: userSearch.setSearchQuery, onShowSearch: userSearch.showSearch, onHideSearch: userSearch.hideSearch, canSearch: !!onSearchUsers }) }), _jsx(Tabs.Panel, { value: "external", style: { flex: 1, overflow: 'auto' }, children: _jsx(ExternalGroupsTab, { canEdit: canEdit, searchQuery: externalGroupSearch.searchQuery, searchResults: externalGroupSearch.searchResults, isSearching: externalGroupSearch.isSearching, searchError: externalGroupSearch.searchError, onSearchQueryChange: externalGroupSearch.setSearchQuery, canSearch: !!onSearchExternalGroups }) })] })), canEdit && isDirty && (_jsxs(Group, { justify: "flex-end", py: "sm", gap: "sm", style: { borderTop: '1px solid var(--mantine-color-gray-3)' }, children: [_jsx(Button, { variant: "subtle", color: "neutral", onClick: discard, disabled: isSaving, children: "Discard Changes" }), _jsx(Button, { onClick: save, loading: isSaving, disabled: isSaving, children: "Save Groups" })] })), _jsx(GroupForm, { isOpen: isModalOpen, editingGroup: editingGroup, formData: formData, onFormChange: handleFormChange, onSave: handleSaveModal, onClose: () => setIsModalOpen(false) })] }));
+    return (_jsx(StagedChangesDrawer, { opened: opened, onClose: onClose, title: "Groups", description: "Manage groups and organizations", size: 600, isDirty: isDirty, isSaving: isSaving, canEdit: canEdit, saveLabel: "Save Groups", onSave: save, onDiscard: discard, childModalOpen: isModalOpen, onExited: onExited, children: _jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, children: [!canEdit && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "yellow", mb: "sm", title: "Read-only", children: "You need admin access to manage groups." })), error && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "red", mb: "sm", title: "Error", withCloseButton: true, onClose: () => setError(null), children: error })), loading ? (_jsxs(Group, { justify: "center", py: "xl", children: [_jsx(Loader, { size: "md" }), _jsx(Text, { size: "sm", c: "dimmed", children: "Loading groups..." })] })) : (_jsxs(Tabs, { defaultValue: "internal", style: { flex: 1, display: 'flex', flexDirection: 'column' }, children: [_jsxs(Tabs.List, { children: [_jsx(Tabs.Tab, { value: "internal", children: "Internal Groups" }), _jsx(Tabs.Tab, { value: "external", children: "External Groups" })] }), _jsx(Tabs.Panel, { value: "internal", style: { flex: 1, overflow: 'auto' }, children: _jsx(InternalGroupsTab, { groups: groups, unsavedGroupIds: unsavedGroupIds, canEdit: canEdit, onCreateGroup: handleCreateGroup, onEditGroup: handleEditGroup, onDeleteGroup: deleteGroup, onAddMember: handleAddMember, onRemoveMember: removeMember, onGetUserMetadata: onGetUserMetadata, activeSearchGroupId: userSearch.activeGroupId, searchQuery: userSearch.searchQuery, searchResults: userSearch.searchResults, isSearching: userSearch.isSearching, searchError: userSearch.searchError, onSearchQueryChange: userSearch.setSearchQuery, onShowSearch: userSearch.showSearch, onHideSearch: userSearch.hideSearch, canSearch: !!onSearchUsers }) }), _jsx(Tabs.Panel, { value: "external", style: { flex: 1, overflow: 'auto' }, children: _jsx(ExternalGroupsTab, { canEdit: canEdit, searchQuery: externalGroupSearch.searchQuery, searchResults: externalGroupSearch.searchResults, isSearching: externalGroupSearch.isSearching, searchError: externalGroupSearch.searchError, onSearchQueryChange: externalGroupSearch.setSearchQuery, canSearch: !!onSearchExternalGroups }) })] })), _jsx(GroupForm, { isOpen: isModalOpen, editingGroup: editingGroup, formData: formData, onFormChange: handleFormChange, onSave: handleSaveModal, onClose: () => setIsModalOpen(false) })] }) }));
 };
 export { useGroupState } from './hooks/useGroupState.js';
 export { useUserSearch } from './hooks/useUserSearch.js';

package/dist/editor/group-manager/types.d.ts

@@ -5,6 +5,9 @@ import type { ExternalGroup } from '../../api/groups.js';
 export type { UserSearchResult, InternalGroup, ExternalGroup };
 export type { CanopyGroupId, CanopyUserId };
 export interface GroupManagerProps {
+    opened: boolean;
+    /** Closes the drawer; while there are unsaved changes it runs only after the user confirms discarding them. */
+    onClose: () => void;
     internalGroups: InternalGroup[];
     loading?: boolean;
     canEdit: boolean;
@@ -12,7 +15,6 @@ export interface GroupManagerProps {
     onSearchUsers?: (query: string, limit?: number) => Promise<UserSearchResult[]>;
     onGetUserMetadata?: (userId: string) => Promise<UserSearchResult | null>;
     onSearchExternalGroups?: (query: string) => Promise<ExternalGroup[]>;
-    onClose?: () => void;
 }
 export interface GroupFormData {
     name: string;

package/dist/editor/hooks/usePermissionManager.js

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { notifications } from '@mantine/notifications';
 import { useApiClient } from '../context/index.js';
 /**
@@ -64,13 +64,14 @@ export function usePermissionManager(options) {
     // an unreadable groups.json rendered as a silently empty picker with no
     // warning, which is the same failure class listGroupsHandler's deliberate
     // 500 exists to prevent.
-    const handleListGroups = async () => {
+    // Stable identity: useGroupsAndUsers reloads groups whenever this function changes.
+    const handleListGroups = useCallback(async () => {
         const result = await apiClient.permissions.listGroups();
         if (!result.ok) {
             throw new Error(result.error || 'Failed to load groups');
         }
         return result.data?.groups ?? [];
-    };
+    }, [apiClient]);
     useEffect(() => {
         if (options.isOpen) {
             loadPermissions();

package/dist/editor/permission-manager/index.js

@@ -7,7 +7,12 @@ import { usePermissionTree } from './hooks/usePermissionTree.js';
 import { useGroupsAndUsers } from './hooks/useGroupsAndUsers.js';
 import { PermissionTree } from './PermissionTree.js';
 import { findTreeNode } from './utils.js';
-export const PermissionManager = ({ collections, contentRoot = 'content', permissions, canEdit, onSave, onSearchUsers, onGetUserMetadata, onListGroups, onClose: __, loading = false, contentTree, }) => {
+import { StagedChangesDrawer, useOpeningKey } from '../components/StagedChangesDrawer.js';
+export const PermissionManager = (props) => {
+    const { key, onExited } = useOpeningKey();
+    return _jsx(PermissionManagerDrawer, { ...props, onExited: onExited }, key);
+};
+const PermissionManagerDrawer = ({ opened, onClose, onExited, collections, contentRoot = 'content', permissions, canEdit, onSave, onSearchUsers, onGetUserMetadata, onListGroups, loading = false, contentTree, }) => {
     const [isSaving, setIsSaving] = useState(false);
     const [error, setError] = useState(null);
     const [activeLevel, setActiveLevel] = useState('read');
@@ -18,7 +23,8 @@ export const PermissionManager = ({ collections, contentRoot = 'content', permis
         contentTree,
     });
     const { groupSelectData, filteredGroups, groupLoadError, groupSearchQuery, showGroupSearch, setGroupSearchQuery, setShowGroupSearch, clearGroupLoadError, userSearchResults, isSearchingUsers, userSearchQuery, showUserSearch, userSearchError, setUserSearchQuery, toggleUserSearch, } = useGroupsAndUsers({
-        onListGroups,
+        // This panel stays mounted while its drawer is closed; groups load on each opening.
+        onListGroups: opened ? onListGroups : undefined,
         onSearchUsers,
         canEdit,
     });
@@ -102,7 +108,7 @@ export const PermissionManager = ({ collections, contentRoot = 'content', permis
             allowedUsers: currentTarget.allowedUsers,
         });
     }, [annotatedTree, localPermissions, updateNodePermission]);
-    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, children: [!canEdit && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "yellow", mb: "sm", title: "Read-only", children: "You need admin access to edit permissions" })), error && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "red", mb: "sm", title: "Error", withCloseButton: true, onClose: () => setError(null), children: error })), groupLoadError && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "orange", mb: "sm", title: "Warning", withCloseButton: true, onClose: clearGroupLoadError, children: groupLoadError })), _jsxs(Group, { gap: "xs", pb: "sm", children: [_jsx(Button, { size: "xs", variant: "subtle", onClick: expandAll, children: "Expand All" }), _jsx(Button, { size: "xs", variant: "subtle", onClick: collapseAll, children: "Collapse All" })] }), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: loading ? (_jsxs(Group, { justify: "center", py: "xl", children: [_jsx(Loader, { size: "md" }), _jsx(Text, { size: "sm", c: "dimmed", children: "Loading permissions..." })] })) : (_jsx(PermissionTree, { node: annotatedTree, expandedNodes: expandedNodes, selectedNode: selectedNode, canEdit: canEdit, groups: groupSelectData, activeLevel: activeLevel, userSearchResults: userSearchResults, isSearchingUsers: isSearchingUsers, showUserSearch: showUserSearch, userSearchQuery: userSearchQuery, userSearchError: userSearchError, showGroupSearch: showGroupSearch, groupSearchQuery: groupSearchQuery, filteredGroups: filteredGroups, onToggle: toggleNode, onSelect: selectNode, onSetActiveLevel: setActiveLevel, onUpdatePermission: updateNodePermission, onSearchUsers: setUserSearchQuery, onGetUserMetadata: onGetUserMetadata, onToggleUserSearch: toggleUserSearch, onAddUser: handleAddUser, onRemoveUser: handleRemoveUser, onSearchGroups: setGroupSearchQuery, onToggleGroupSearch: setShowGroupSearch, onAddGroup: handleAddGroup, onRemoveGroup: handleRemoveGroup })) }), canEdit && isDirty && (_jsxs(Group, { justify: "flex-end", py: "sm", gap: "sm", style: { borderTop: '1px solid var(--mantine-color-gray-3)' }, children: [_jsx(Button, { variant: "subtle", color: "neutral", onClick: handleDiscard, disabled: isSaving, children: "Discard Changes" }), _jsx(Button, { onClick: handleSave, loading: isSaving, disabled: isSaving, children: "Save Permissions" })] }))] }));
+    return (_jsx(StagedChangesDrawer, { opened: opened, onClose: onClose, title: "Permissions", description: "Manage content access by path (read, edit, review)", size: 700, isDirty: isDirty, isSaving: isSaving, canEdit: canEdit, saveLabel: "Save Permissions", onSave: handleSave, onDiscard: handleDiscard, onExited: onExited, children: _jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, children: [!canEdit && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "yellow", mb: "sm", title: "Read-only", children: "You need admin access to edit permissions" })), error && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "red", mb: "sm", title: "Error", withCloseButton: true, onClose: () => setError(null), children: error })), groupLoadError && (_jsx(Alert, { icon: _jsx(IconAlertCircle, { size: 16 }), color: "orange", mb: "sm", title: "Warning", withCloseButton: true, onClose: clearGroupLoadError, children: groupLoadError })), _jsxs(Group, { gap: "xs", pb: "sm", children: [_jsx(Button, { size: "xs", variant: "subtle", onClick: expandAll, children: "Expand All" }), _jsx(Button, { size: "xs", variant: "subtle", onClick: collapseAll, children: "Collapse All" })] }), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: loading ? (_jsxs(Group, { justify: "center", py: "xl", children: [_jsx(Loader, { size: "md" }), _jsx(Text, { size: "sm", c: "dimmed", children: "Loading permissions..." })] })) : (_jsx(PermissionTree, { node: annotatedTree, expandedNodes: expandedNodes, selectedNode: selectedNode, canEdit: canEdit, groups: groupSelectData, activeLevel: activeLevel, userSearchResults: userSearchResults, isSearchingUsers: isSearchingUsers, showUserSearch: showUserSearch, userSearchQuery: userSearchQuery, userSearchError: userSearchError, showGroupSearch: showGroupSearch, groupSearchQuery: groupSearchQuery, filteredGroups: filteredGroups, onToggle: toggleNode, onSelect: selectNode, onSetActiveLevel: setActiveLevel, onUpdatePermission: updateNodePermission, onSearchUsers: setUserSearchQuery, onGetUserMetadata: onGetUserMetadata, onToggleUserSearch: toggleUserSearch, onAddUser: handleAddUser, onRemoveUser: handleRemoveUser, onSearchGroups: setGroupSearchQuery, onToggleGroupSearch: setShowGroupSearch, onAddGroup: handleAddGroup, onRemoveGroup: handleRemoveGroup })) })] }) }));
 };
 export { usePermissionTree } from './hooks/usePermissionTree.js';
 export { useGroupsAndUsers } from './hooks/useGroupsAndUsers.js';

package/dist/editor/permission-manager/types.d.ts

@@ -2,6 +2,9 @@ import type { PathPermission, PermissionLevel, PermissionTarget } from '../../co
 import type { UserSearchResult, GroupSource, PermissionGroupOption } from '../../auth/types.js';
 import type { EditorCollection } from '../Editor.js';
 export interface PermissionManagerProps {
+    opened: boolean;
+    /** Closes the drawer; while there are unsaved changes it runs only after the user confirms discarding them. */
+    onClose: () => void;
     /** Collections from API */
     collections?: EditorCollection[];
     /** Content root path (default: 'content') */
@@ -14,7 +17,6 @@ export interface PermissionManagerProps {
     onGetUserMetadata?: (userId: string) => Promise<UserSearchResult | null>;
     /** Handler to list groups (internal + external, tagged by `source`) */
     onListGroups?: () => Promise<PermissionGroupOption[]>;
-    onClose?: () => void;
     loading?: boolean;
     /** Optional: actual filesystem content tree (for entries not in schema) */
     contentTree?: ContentNode;

package/dist/git-manager.d.ts

@@ -49,6 +49,16 @@ export type BareRemoteRepackResult = {
  * it packed and their emptied fan-out directories. `git` as for `ensureRemoteGitConfig`.
  */
 export declare function repackBareRemoteIfNeeded(gitDir: string, git?: SimpleGit): Promise<BareRemoteRepackResult>;
+/**
+ * simple-git reads a git that exited by signal (exit code null, often with no stderr) as success,
+ * so a clone or checkout the OOM killer stopped would pass for complete. Given as `errors` to a
+ * GitManager's own instance, to `cloneRepo`'s, and to the worker's ref probes of an existing
+ * remote.git (worker/cms-worker.ts); its static helpers and the bare-remote functions do not pass
+ * it yet (.claude/future-tasks/simple-git-signal-exit-reads-as-success.md).
+ */
+export declare function failOnSignalExit(error: Buffer | Error | undefined, result: {
+    exitCode: number;
+}): Buffer | Error | undefined;
 /**
  * Config every workspace clone writes into its own `.git/config`: the managed
  * marker that ensureRemote's guard checks, and a fallback author for internal

package/dist/git-manager.js

@@ -77,8 +77,8 @@ export function gitChildEnv(overrides) {
  * classifier into a no-op.
  *
  * `GIT_SSH_COMMAND` stays out even though it is a "network" variable:
- * simple-git hard-blocks it (`allowUnsafeSshCommand`), and `buildGitHubUrl()`
- * produces an `https://` URL, so the worker never reaches GitHub over SSH.
+ * simple-git hard-blocks it (`allowUnsafeSshCommand`), and the worker's GitHub
+ * gateway builds an `https://` URL, so the worker never reaches GitHub over SSH.
  */
 const GIT_NETWORK_ENV_PASSTHROUGH = /^((HTTPS?|ALL)_PROXY|(https?|all)_proxy|NO_PROXY|no_proxy|GIT_SSL_(CAINFO|CAPATH|NO_VERIFY|VERSION)|CURL_CA_BUNDLE|SSL_CERT_(FILE|DIR)|REQUESTS_CA_BUNDLE|NODE_EXTRA_CA_CERTS)$/;
 export function gitNetworkChildEnv() {
@@ -179,10 +179,11 @@ export async function repackBareRemoteIfNeeded(gitDir, git = simpleGit().env(git
 /**
  * simple-git reads a git that exited by signal (exit code null, often with no stderr) as success,
  * so a clone or checkout the OOM killer stopped would pass for complete. Given as `errors` to a
- * GitManager's own instance and to `cloneRepo`'s; its static helpers and the bare-remote functions
- * do not pass it yet (.claude/future-tasks/simple-git-signal-exit-reads-as-success.md).
+ * GitManager's own instance, to `cloneRepo`'s, and to the worker's ref probes of an existing
+ * remote.git (worker/cms-worker.ts); its static helpers and the bare-remote functions do not pass
+ * it yet (.claude/future-tasks/simple-git-signal-exit-reads-as-success.md).
  */
-function failOnSignalExit(error, result) {
+export function failOnSignalExit(error, result) {
     if (error)
         return error;
     if (result.exitCode === null) {

package/dist/utils/error.js

@@ -77,6 +77,12 @@ export function redactCredentials(message) {
     // literal `://` (leaving the scheme untouched) — a `\w+` scheme prefix backtracks
     // polynomially on long word-character runs (CodeQL js/polynomial-redos).
     result = result.replace(/(:\/\/)[^/\s@]+@/g, '$1***@');
+    // An `Authorization` header's credential: the worker's GitHub-bound git carries the token as
+    // `AUTHORIZATION: basic <base64>` (worker/github-mirror.ts).
+    result = result.replace(/(\bauthorization\s*:\s*(?:basic|bearer|token)\s+)[A-Za-z0-9+/=._~-]+/gi, '$1***');
+    // That header's base64 of `x-access-token:<token>` wherever it appears on its own. The 15-byte
+    // prefix encodes to the same 20 characters whatever the token, with no padding to shift it.
+    result = result.replace(/eC1hY2Nlc3MtdG9rZW46[A-Za-z0-9+/]*={0,2}/g, '***');
     // Bare token shapes, for messages embedding a token outside URL userinfo: GitHub token
     // prefixes and Bearer values.
     result = result.replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{8,}/g, '***');

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CANOPYCMS_VERSION = "0.0.68-int.111";
+export declare const CANOPYCMS_VERSION = "0.0.68-int.113";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by scripts/bump-version.mjs, its only writer. The package builds with plain
 // tsc (rootDir: src), so src/ cannot import ../package.json; version.test.ts keeps the two equal.
-export const CANOPYCMS_VERSION = '0.0.68-int.111';
+export const CANOPYCMS_VERSION = '0.0.68-int.113';