canopycms 0.0.63 → 0.0.65

package/dist/dev-content-watcher.d.ts

@@ -15,9 +15,17 @@
  *
  * All logic lives here in the core package; framework adapters just call startDevContentWatcher() once
  * at dev startup. See packages/canopycms-next/src/context-wrapper.ts for the Next wiring.
+ *
+ * ## Divergence is a CONDITION, not an event
+ *
+ * It stays true until someone runs `sync push`, so the two things this module has to get right are
+ * (a) not re-printing the same condition into a scrolling request log, and (b) making the one printing
+ * of it hard to scroll past. Both are handled below by `reportOnce` + the gutter formatting; see
+ * `.claude/future-tasks/dev-divergence-in-app-surface.md` for the in-app surface that would replace
+ * the terminal as the primary home for this.
  */
-import type { CanopyServices } from './services';
-import type { DevContentSyncMode } from './config/types';
+import type { CanopyServices } from './services.js';
+import type { DevContentSyncMode } from './config/types.js';
 export interface StartDevContentWatcherOptions {
     /** 'warn' (default) | 'off'. */
     mode?: DevContentSyncMode;
@@ -28,10 +36,11 @@ export interface StartDevContentWatcherOptions {
     /** Warning sink. Defaults to console.warn. */
     warn?: (message: string) => void;
 }
+/** Test-only: dispose every armed watcher and drop all cross-module dedupe state. */
+export declare function resetDevContentWatchersForTests(): void;
 /**
  * Start watching the working-tree content directory for divergence from the served dev branch clone.
  * Returns a disposer that stops the watcher. A no-op (returns immediately) when mode is 'off', when
  * not in dev mode, or when the working-tree content directory does not exist.
  */
 export declare function startDevContentWatcher(services: CanopyServices, options?: StartDevContentWatcherOptions): () => void;
-//# sourceMappingURL=dev-content-watcher.d.ts.map

package/dist/dev-content-watcher.js

@@ -15,35 +15,98 @@
  *
  * All logic lives here in the core package; framework adapters just call startDevContentWatcher() once
  * at dev startup. See packages/canopycms-next/src/context-wrapper.ts for the Next wiring.
+ *
+ * ## Divergence is a CONDITION, not an event
+ *
+ * It stays true until someone runs `sync push`, so the two things this module has to get right are
+ * (a) not re-printing the same condition into a scrolling request log, and (b) making the one printing
+ * of it hard to scroll past. Both are handled below by `reportOnce` + the gutter formatting; see
+ * `.claude/future-tasks/dev-divergence-in-app-surface.md` for the in-app surface that would replace
+ * the terminal as the primary home for this.
  */
 import fsSync from 'node:fs';
 import path from 'node:path';
 import chokidar from 'chokidar';
+import pc from 'picocolors';
 import { operatingStrategy } from './operating-mode/index.js';
 import { getErrorMessage } from './utils/error.js';
 import { diffContentTrees, isContentTreeDiffEmpty } from './sync-core.js';
-const MAX_LISTED_FILES = 10;
-// Dedupe watchers by working-tree content dir so HMR re-evaluating the adapter module (which discards
-// the disposer) doesn't accumulate watchers. This module lives in canopycms/server, so its state
-// survives app-side HMR. Each new start disposes any prior watcher for the same dir.
-const activeWatchers = new Map();
+/**
+ * Per-category cap on listed files. Deliberately small: the block is a prompt to run `sync push`,
+ * not a diff viewer, and a 30-line wall of paths is exactly as easy to scroll past as a 1-line
+ * warning. Each list carries its true count, so nothing is hidden -- only elided.
+ */
+const MAX_LISTED_FILES = 5;
+/**
+ * The registry lives on `globalThis`, NOT in module scope.
+ *
+ * Next's dev server compiles the server graph per route bundle and evaluates each copy in its own
+ * module scope, so a module-level `Map` is re-created empty per bundle -- every copy then believes it
+ * is the first watcher, arms its own, and re-prints the startup warning. (The duplicated
+ * "CanopyCMS dev-auth: Auto-configured ..." line in a dev log is the same effect on a different
+ * module-level latch.) A `globalThis` property is the one thing shared across those evaluations.
+ */
+const REGISTRY_KEY = '__canopycmsDevContentWatchers__';
+function watcherRegistry() {
+    const host = globalThis;
+    const existing = host[REGISTRY_KEY];
+    if (existing)
+        return existing;
+    const created = new Map();
+    host[REGISTRY_KEY] = created;
+    return created;
+}
+/** Test-only: dispose every armed watcher and drop all cross-module dedupe state. */
+export function resetDevContentWatchersForTests() {
+    const registry = watcherRegistry();
+    for (const state of registry.values())
+        state.dispose?.();
+    registry.clear();
+}
+/**
+ * One body line of the notice block. The left gutter (rather than a full box) is deliberate: content
+ * paths are long and unpredictable, and a right border would force either wrapping math or truncation
+ * of the very filenames the block exists to name.
+ */
+function body(line) {
+    const gutter = pc.yellow('|');
+    return line ? `${gutter} ${line}` : gutter;
+}
 function formatList(label, files) {
     if (files.length === 0)
-        return null;
-    const shown = files.slice(0, MAX_LISTED_FILES).join(', ');
-    const extra = files.length > MAX_LISTED_FILES ? `, …(+${files.length - MAX_LISTED_FILES} more)` : '';
-    return `  ${label}: ${shown}${extra}`;
+        return [];
+    const shown = files.slice(0, MAX_LISTED_FILES);
+    const lines = [body(pc.bold(`${label} (${files.length})`)), ...shown.map((f) => body(`  ${f}`))];
+    if (files.length > shown.length) {
+        lines.push(body(pc.dim(`  +${files.length - shown.length} more`)));
+    }
+    return lines;
 }
 function formatDivergenceWarning(branch, diff) {
-    const lines = [
-        `CanopyCMS: working-tree content has diverged from the dev branch clone "${branch}" — the dev ` +
-            'server is serving stale content. Run `npx canopycms sync push` to update it ' +
-            "(set dev.contentSync: 'off' to silence this).",
-        formatList('changed', diff.changed),
-        formatList('only in working tree', diff.added),
-        formatList('only in branch clone', diff.removed),
-    ].filter((line) => line !== null);
-    return lines.join('\n');
+    const total = diff.changed.length + diff.added.length + diff.removed.length;
+    // Blank lines top and bottom: the block's job is to be findable in a scrolling request log, and
+    // whitespace separation does more for that than any amount of in-block decoration.
+    return [
+        '',
+        `${pc.bgYellow(pc.black(' CanopyCMS '))} ${pc.bold(pc.yellow('working-tree content has diverged'))}`,
+        body(`The dev server is serving ${pc.bold('stale content')}: ${total} file(s) differ from the`),
+        body(`dev branch clone "${branch}".`),
+        body(''),
+        ...formatList('changed', diff.changed),
+        ...formatList('only in working tree', diff.added),
+        ...formatList('only in branch clone', diff.removed),
+        body(''),
+        body(`Fix:     ${pc.bold('npx canopycms sync push')}`),
+        body(pc.dim("Silence: set dev.contentSync: 'off' in your Canopy config")),
+        '',
+    ].join('\n');
+}
+function formatResolvedNotice(branch) {
+    return [
+        '',
+        `${pc.bgGreen(pc.black(' CanopyCMS '))} ${pc.green(`working-tree content is back in sync with "${branch}"`)}`,
+        '',
+    ].join('\n');
 }
 /**
  * Start watching the working-tree content directory for divergence from the served dev branch clone.
@@ -73,6 +136,27 @@ export function startDevContentWatcher(services, options = {}) {
         services.config.defaultActiveBranch ??
         services.config.defaultBaseBranch ??
         'main';
+    const registry = watcherRegistry();
+    let state = registry.get(workingTreeContentDir);
+    if (!state) {
+        state = { dispose: null, lastMessage: null, reportedDivergence: false };
+        registry.set(workingTreeContentDir, state);
+    }
+    const watcherState = state;
+    // Dispose any prior watcher for this dir (HMR re-start) before creating a new one. The registry
+    // ENTRY deliberately survives, carrying lastMessage/reportedDivergence into the new watcher.
+    watcherState.dispose?.();
+    /**
+     * Emit `message` unless it is verbatim what was emitted last for this directory. Covers the
+     * divergence block, the resolved notice and the error paths alike: in every case a repeat means
+     * "the condition is unchanged", which the reader already knows.
+     */
+    const reportOnce = (message) => {
+        if (watcherState.lastMessage === message)
+            return;
+        watcherState.lastMessage = message;
+        warn(message);
+    };
     let running = false;
     let pending = false;
     const check = async () => {
@@ -84,16 +168,26 @@ export function startDevContentWatcher(services, options = {}) {
         try {
             const branch = resolveBranch();
             const branchContentDir = path.join(strategy.getContentBranchRoot(branch, sourceRoot), contentRoot);
-            // No branch clone yet (e.g. before the first editor/dev request created it) → nothing to compare.
+            // No branch clone yet (e.g. before the first editor/dev request created it) -> nothing to
+            // compare. Deliberately leaves reportedDivergence alone: "cannot tell" is not "resolved".
             if (!fsSync.existsSync(branchContentDir))
                 return;
             const diff = await diffContentTrees(workingTreeContentDir, branchContentDir);
-            if (isContentTreeDiffEmpty(diff))
+            if (isContentTreeDiffEmpty(diff)) {
+                // Close the loop: a condition that was announced needs its retraction announced too, or the
+                // reader is left believing the dev server is still serving stale content.
+                if (watcherState.reportedDivergence) {
+                    watcherState.reportedDivergence = false;
+                    reportOnce(formatResolvedNotice(branch));
+                }
                 return;
-            warn(formatDivergenceWarning(branch, diff));
+            }
+            // Set BEFORE reporting so a deduped repeat still leaves the condition marked as outstanding.
+            watcherState.reportedDivergence = true;
+            reportOnce(formatDivergenceWarning(branch, diff));
         }
         catch (err) {
-            warn(`CanopyCMS: dev content-sync check failed: ${getErrorMessage(err)}`);
+            reportOnce(`CanopyCMS: dev content-sync check failed: ${getErrorMessage(err)}`);
         }
         finally {
             running = false;
@@ -103,23 +197,19 @@ export function startDevContentWatcher(services, options = {}) {
             }
         }
     };
-    // Dispose any prior watcher for this dir (HMR re-start) before creating a new one.
-    activeWatchers.get(workingTreeContentDir)?.();
     const watcher = chokidar.watch(workingTreeContentDir, { ignoreInitial: true });
     watcher.on('add', () => void check());
     watcher.on('change', () => void check());
     watcher.on('unlink', () => void check());
     // Handle watcher errors (e.g. inotify ENOSPC/EMFILE) so an unhandled 'error' event can't crash dev.
-    watcher.on('error', (err) => warn(`CanopyCMS: dev content-sync watcher error: ${getErrorMessage(err)}`));
+    watcher.on('error', (err) => reportOnce(`CanopyCMS: dev content-sync watcher error: ${getErrorMessage(err)}`));
     // Initial divergence check at startup.
     void check();
     const dispose = () => {
         void watcher.close();
-        if (activeWatchers.get(workingTreeContentDir) === dispose) {
-            activeWatchers.delete(workingTreeContentDir);
-        }
+        if (watcherState.dispose === dispose)
+            watcherState.dispose = null;
     };
-    activeWatchers.set(workingTreeContentDir, dispose);
+    watcherState.dispose = dispose;
     return dispose;
 }
-//# sourceMappingURL=dev-content-watcher.js.map

package/dist/editor/BranchManager.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import type { OperatingMode } from '../operating-mode';
-import type { ConflictStatus, PullRequestState, SyncStatus } from '../types';
-import type { CommentThread } from '../comment-store';
-import type { UserSearchResult } from '../auth/types';
+import type { OperatingMode } from '../operating-mode/index.js';
+import type { ConflictStatus, PullRequestState, SyncStatus } from '../types.js';
+import type { CommentThread } from '../comment-store.js';
+import type { UserSearchResult } from '../auth/types.js';
 export interface BranchSummary {
     name: string;
     status: string;
@@ -85,4 +85,3 @@ export interface BranchManagerProps {
     onGetUserMetadata?: (userId: string) => Promise<UserSearchResult | null>;
 }
 export declare const BranchManager: React.FC<BranchManagerProps>;
-//# sourceMappingURL=BranchManager.d.ts.map

package/dist/editor/BranchManager.js

@@ -152,4 +152,3 @@ export const BranchManager = ({ branches, mode, user, onSelect, onCreate, onDele
                                                             : 'Only Admin or branch creator can delete', disabled: perms.canDelete, children: _jsx(Button, { size: "xs", variant: "outline", color: "red", onClick: () => onDelete?.(b.name), disabled: !perms.canDelete, "data-testid": `delete-branch-button-${b.name}`, children: "Delete" }) })] })] }) }, b.name));
                     }) })) })] }));
 };
-//# sourceMappingURL=BranchManager.js.map

package/dist/editor/CanopyEditor.d.ts

@@ -1,10 +1,9 @@
 import React from 'react';
-import type { CanopyClientConfig } from '../config';
-import type { EditorProps } from './Editor';
+import type { CanopyClientConfig } from '../config/index.js';
+import type { EditorProps } from './Editor.js';
 export interface CanopyEditorProps extends Omit<EditorProps, 'collections' | 'previewBaseByCollection' | 'title' | 'subtitle' | 'themeOptions' | 'entries' | 'contentRoot' | 'operatingMode'> {
     config: CanopyClientConfig;
     entries?: EditorProps['entries'];
 }
 export declare const CanopyEditor: React.FC<CanopyEditorProps>;
 export default CanopyEditor;
-//# sourceMappingURL=CanopyEditor.d.ts.map

package/dist/editor/CanopyEditor.js

@@ -16,7 +16,6 @@ export const CanopyEditor = ({ config, entries = [], initialSelectedId, initialV
     const resolvedTitle = config.editor?.title ?? 'CanopyCMS Editor';
     const resolvedSubtitle = config.editor?.subtitle;
     const resolvedTheme = config.editor?.theme ?? undefined;
-    return (_jsx(SWRProvider, { children: _jsx(ApiClientProvider, { children: _jsx(Editor, { entries: entries, title: resolvedTitle, subtitle: resolvedSubtitle, branchName: resolvedBranchName, operatingMode: config.mode, initialSelectedId: initialSelectedId, initialValues: initialValues, renderPreview: renderPreview, onCreateEntry: onCreateEntry, customRenderers: customRenderers, collections: collections, contentRoot: config.contentRoot, entryLinkUrl: config.entryLinkUrl, previewBaseByCollection: previewBase, assetBaseUrl: config.assetBaseUrl, themeOptions: resolvedTheme, AccountComponent: config.editor?.AccountComponent, onAccountClick: config.editor?.onAccountClick, onLogoutClick: config.editor?.onLogoutClick }) }) }));
+    return (_jsx(SWRProvider, { children: _jsx(ApiClientProvider, { basePath: config.basePath, children: _jsx(Editor, { entries: entries, title: resolvedTitle, subtitle: resolvedSubtitle, branchName: resolvedBranchName, operatingMode: config.mode, initialSelectedId: initialSelectedId, initialValues: initialValues, renderPreview: renderPreview, onCreateEntry: onCreateEntry, customRenderers: customRenderers, collections: collections, contentRoot: config.contentRoot, entryLinkUrl: config.entryLinkUrl, previewBaseByCollection: previewBase, assetBaseUrl: config.assetBaseUrl, basePath: config.basePath, themeOptions: resolvedTheme, AccountComponent: config.editor?.AccountComponent, onAccountClick: config.editor?.onAccountClick, onLogoutClick: config.editor?.onLogoutClick }) }) }));
 };
 export default CanopyEditor;
-//# sourceMappingURL=CanopyEditor.js.map

package/dist/editor/CanopyEditorPage.d.ts

@@ -1,5 +1,5 @@
-import type { CanopyClientConfig } from '../config';
-import type { CustomFieldRenderers } from './FormRenderer';
+import type { CanopyClientConfig } from '../config/index.js';
+import type { CustomFieldRenderers } from './FormRenderer.js';
 /**
  * @param customRenderers Optional adopter overrides for how specific field
  * types render (see `FormRenderer`'s `customRenderers` prop). Threaded
@@ -17,4 +17,3 @@ export declare const CanopyEditorPage: (config: CanopyClientConfig, customRender
     displayName: string;
 };
 export default CanopyEditorPage;
-//# sourceMappingURL=CanopyEditorPage.d.ts.map

package/dist/editor/CanopyEditorPage.js

@@ -20,4 +20,3 @@ export const CanopyEditorPage = (config, customRenderers) => {
     return CanopyEditorPageInner;
 };
 export default CanopyEditorPage;
-//# sourceMappingURL=CanopyEditorPage.js.map

package/dist/editor/CommentsPanel.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { CommentThread } from '../comment-store';
-import type { UserSearchResult } from '../auth/types';
+import type { CommentThread } from '../comment-store.js';
+import type { UserSearchResult } from '../auth/types.js';
 export interface CommentsPanelProps {
     branchName: string;
     comments: CommentThread[];
@@ -18,4 +18,3 @@ export interface CommentsPanelProps {
     onGetUserMetadata?: (userId: string) => Promise<UserSearchResult | null>;
 }
 export declare const CommentsPanel: React.FC<CommentsPanelProps>;
-//# sourceMappingURL=CommentsPanel.d.ts.map

package/dist/editor/CommentsPanel.js

@@ -66,4 +66,3 @@ export const CommentsPanel = ({ branchName, comments, canResolve, onAddComment,
                                             setNewCommentText('');
                                         }, mt: "xs", children: "Reply" }))] }) }, thread.id))) })) })] }) }));
 };
-//# sourceMappingURL=CommentsPanel.js.map

package/dist/editor/Editor.d.ts

@@ -1,16 +1,15 @@
 import React from 'react';
-import type { ContentFormat, EntrySchema } from '../config';
-import type { CustomFieldRenderers, FormValue } from './FormRenderer';
-import type { OperatingMode } from '../operating-mode';
-import { type CanopyThemeOptions } from './theme';
-import type { LogicalPath, ContentId } from '../paths/types';
+import type { ContentFormat, EntrySchema } from '../config/index.js';
+import type { CustomFieldRenderers, FormValue } from './FormRenderer.js';
+import type { OperatingMode } from '../operating-mode/index.js';
+import { type CanopyThemeOptions } from './theme.js';
+import type { LogicalPath, ContentId } from '../paths/types.js';
 export interface EditorEntry {
     path: LogicalPath;
     contentId: ContentId;
     label: string;
     status?: string;
     schema: EntrySchema;
-    apiPath: string;
     previewSrc?: string;
     collectionPath?: LogicalPath;
     collectionName?: string;
@@ -52,7 +51,7 @@ export interface EditorProps {
     operatingMode: OperatingMode;
     collections?: EditorCollection[];
     contentRoot?: string;
-    entryLinkUrl?: import('../entry-link-resolver').EntryLinkUrlResolver;
+    entryLinkUrl?: import('../entry-link-resolver.js').EntryLinkUrlResolver;
     initialSelectedId?: string;
     initialValues?: Record<string, FormValue>;
     renderPreview?: (entry: EditorEntry, value: FormValue | undefined) => React.ReactNode;
@@ -63,6 +62,13 @@ export interface EditorProps {
     canResolveComments?: boolean;
     /** `media.publicBaseUrl` from config - prefixed onto asset URLs the editor builds (MediaLibrary/ImageField/MDX image dialog). Undefined means root-relative (editor and site share an origin). */
     assetBaseUrl?: string;
+    /**
+     * `CanopyClientConfig.basePath` - the deployment prefix the host Next.js app is served under
+     * (e.g. `/preview-123`). Prefixed onto every preview iframe `src` this component builds via
+     * `buildPreviewSrc`, so the iframe navigates to the entry's real served URL instead of the
+     * un-prefixed root. Undefined means the app is served at its origin's root (no-op).
+     */
+    basePath?: string;
     /**
      * Adopter-supplied overrides for how specific field types render, keyed by
      * field `type` (see `FormRenderer`'s `customRenderers` prop). Threaded
@@ -81,4 +87,3 @@ export interface EditorProps {
  */
 export declare const Editor: React.FC<EditorProps>;
 export default Editor;
-//# sourceMappingURL=Editor.d.ts.map

package/dist/editor/Editor.js

@@ -33,7 +33,7 @@ import { MediaLibrary } from './media/MediaLibrary.js';
  * High-level editor wrapper that wires entry navigation, form rendering,
  * saving/loading, and preview rendering using entry definitions.
  */
-export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtitle = subtitle, branchName = '', collections, contentRoot, entryLinkUrl, initialSelectedId, initialValues, renderPreview, onCreateEntry, themeOptions, operatingMode, previewBaseByCollection, currentUser = 'current-user', canResolveComments = true, assetBaseUrl, AccountComponent, onAccountClick, onLogoutClick, customRenderers, }) => {
+export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtitle = subtitle, branchName = '', collections, contentRoot, entryLinkUrl, initialSelectedId, initialValues, renderPreview, onCreateEntry, themeOptions, operatingMode, previewBaseByCollection, currentUser = 'current-user', canResolveComments = true, assetBaseUrl, basePath, AccountComponent, onAccountClick, onLogoutClick, customRenderers, }) => {
     // Per-resource loading states
     const [branchesLoading, setBranchesLoading] = useState(false);
     const [entriesLoading, setEntriesLoading] = useState(false);
@@ -117,9 +117,9 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
             branchName: branchNameState,
             previewBaseByCollection,
             contentRoot,
+            basePath,
         }),
         setBusy: setEntriesLoading,
-        contentRoot,
     });
     // Keep the entry-type list referentially stable for as long as the create
     // modal is showing the same collection. Building it inline in the JSX handed
@@ -492,7 +492,7 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
         // such collection" the same (correct) not-found outcome, so the guard
         // below is reachable again. See the correction to PR #196's "unreachable
         // with entries empty" claim in
-        // .claude/future-tasks/program-b-final-review-followups.md for the write
+        // .claude/future-tasks/resolved/program-b-final-review-followups.md for the write
         // hazard this closes -- found by the 2026-08-12 adversarial review.
         const collection = findCollection(collectionsFromApi, collectionPath);
         if (!collection) {
@@ -663,7 +663,7 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
     const footerHeight = 40;
     const headerTitle = currentEntry?.label ?? currentEntry?.slug ?? title;
     const breadcrumbSegments = useMemo(() => buildBreadcrumbSegments(currentEntry, collectionLabels), [collectionLabels, currentEntry]);
-    return (_jsx(CanopyCMSProvider, { ...(themeOptions ?? {}), children: _jsx(AssetContextProvider, { baseUrl: assetBaseUrl, children: _jsxs(Box, { bg: "gray.0", style: { minHeight: '100vh', width: '100%' }, children: [_jsx(EditorHeader, { ref: headerRef, siteTitle: siteTitle, siteSubtitle: siteSubtitle, headerTitle: headerTitle, currentEntry: currentEntry, branchName: branchNameState, operatingMode: operatingMode, branchStatus: currentBranch?.status, busy: busy, breadcrumbSegments: breadcrumbSegments, editedFiles: editedFiles, modifiedCount: modifiedCount, unresolvedCommentCount: comments.filter((t) => !t.resolved).length, comments: comments, hasUnsavedChanges: isSelectedDirty(), userContext: userContext, branchCreatedBy: currentBranch?.createdBy, branchAccess: currentBranch?.access, 
+    return (_jsx(CanopyCMSProvider, { ...(themeOptions ?? {}), children: _jsx(AssetContextProvider, { baseUrl: assetBaseUrl, basePath: basePath, children: _jsxs(Box, { bg: "gray.0", style: { minHeight: '100vh', width: '100%' }, children: [_jsx(EditorHeader, { ref: headerRef, siteTitle: siteTitle, siteSubtitle: siteSubtitle, headerTitle: headerTitle, currentEntry: currentEntry, branchName: branchNameState, operatingMode: operatingMode, branchStatus: currentBranch?.status, busy: busy, breadcrumbSegments: breadcrumbSegments, editedFiles: editedFiles, modifiedCount: modifiedCount, unresolvedCommentCount: comments.filter((t) => !t.resolved).length, comments: comments, hasUnsavedChanges: isSelectedDirty(), userContext: userContext, branchCreatedBy: currentBranch?.createdBy, branchAccess: currentBranch?.access, 
                         // Fail-closed for the same reason branchContentLocked above is:
                         // isProtected/writeBlocked gate real actions in EditorHeader (hiding
                         // Submit, disabling Save), so a missing wire value must read as
@@ -753,4 +753,3 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
                         }, loading: deleteInProgress })] }) }) }));
 };
 export default Editor;
-//# sourceMappingURL=Editor.js.map

package/dist/editor/EditorPanes.d.ts

@@ -8,4 +8,3 @@ export interface EditorPanesProps {
 }
 export declare const EditorPanes: React.FC<EditorPanesProps>;
 export default EditorPanes;
-//# sourceMappingURL=EditorPanes.d.ts.map

package/dist/editor/EditorPanes.js

@@ -96,4 +96,3 @@ export const EditorPanes = ({ layout: layoutProp = 'side', onLayoutChange: _, pr
                                 }, children: form ?? 'Form' }) })] }) }) }) }));
 };
 export default EditorPanes;
-//# sourceMappingURL=EditorPanes.js.map

package/dist/editor/EntryNavigator.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ContentId, LogicalPath } from '../paths/types';
+import type { ContentId, LogicalPath } from '../paths/types.js';
 import { useTree } from '@mantine/core';
 type TreeController = ReturnType<typeof useTree>;
 export interface EntryNavItem {
@@ -54,4 +54,3 @@ export interface EntryNavigatorProps {
 }
 export declare const EntryNavigator: React.FC<EntryNavigatorProps>;
 export default EntryNavigator;
-//# sourceMappingURL=EntryNavigator.d.ts.map

package/dist/editor/EntryNavigator.js

@@ -340,4 +340,3 @@ export const EntryNavigator = ({ items, collections, selectedPath, onSelect, onT
     return (_jsx(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "entry-navigator", children: _jsx(ScrollArea, { type: "auto", offsetScrollbars: true, style: { flex: 1 }, children: treeData.length === 0 ? (loading ? (_jsxs(Group, { gap: "xs", py: "sm", children: [_jsx(Loader, { size: "xs" }), _jsx(Text, { size: "xs", c: "dimmed", children: "Loading content\u2026" })] })) : (_jsx(Text, { size: "xs", c: "dimmed", py: "sm", children: "No content" }))) : (_jsx(Box, { py: "sm", children: _jsx(Tree, { data: treeData, tree: tree, renderNode: renderNode, selectOnClick: false, levelOffset: "sm" }) })) }) }));
 };
 export default EntryNavigator;
-//# sourceMappingURL=EntryNavigator.js.map

package/dist/editor/FormRenderer.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { EntrySchema, FieldConfig } from '../config';
-import type { CommentThread } from '../comment-store';
+import type { EntrySchema, FieldConfig } from '../config/index.js';
+import type { CommentThread } from '../comment-store.js';
 export type FormValue = Record<string, unknown>;
 export interface CustomFieldRenderProps {
     field: FieldConfig;
@@ -38,4 +38,3 @@ export interface FormRendererProps {
 }
 export declare const FormRenderer: React.FC<FormRendererProps>;
 export default FormRenderer;
-//# sourceMappingURL=FormRenderer.d.ts.map

package/dist/editor/FormRenderer.js

@@ -139,13 +139,33 @@ export const FormRenderer = ({ fields, value, onChange, customRenderers, branch
                     const items = Array.isArray(currentValue)
                         ? currentValue
                         : [];
-                    return (_jsx(Paper, { withBorder: true, radius: "md", p: "md", shadow: "xs", children: _jsxs(Stack, { gap: "sm", children: [_jsxs(Group, { justify: "space-between", children: [_jsx(Text, { size: "sm", fw: 600, children: label }), _jsx(Button, { size: "xs", variant: "light", onClick: () => update([...items, {}]), children: "Add item" })] }), _jsxs(Stack, { gap: "sm", children: [items.map((item, idx) => (_jsx(Paper, { withBorder: true, radius: "md", p: "sm", shadow: "xs", children: _jsxs(Stack, { gap: "xs", children: [_jsxs(Group, { justify: "space-between", children: [_jsxs(Text, { size: "xs", fw: 700, children: [label, " #", idx + 1] }), _jsx(Button, { size: "xs", variant: "subtle", color: "red", onClick: () => update(items.filter((_, i) => i !== idx)), children: "Remove" })] }), _jsx(ObjectField, { label: objectField.label, fields: objectField.fields, value: item, onChange: (next) => {
+                    return wrapWithComments(_jsx(Paper, { withBorder: true, radius: "md", p: "md", shadow: "xs", children: _jsxs(Stack, { gap: "sm", children: [_jsxs(Group, { justify: "space-between", children: [_jsx(Text, { size: "sm", fw: 600, children: label }), _jsx(Button, { size: "xs", variant: "light", onClick: () => update([...items, {}]), children: "Add item" })] }), _jsxs(Stack, { gap: "sm", children: [items.map((item, idx) => (_jsx(Paper, { withBorder: true, radius: "md", p: "sm", shadow: "xs", children: _jsxs(Stack, { gap: "xs", children: [_jsxs(Group, { justify: "space-between", children: [_jsxs(Text, { size: "xs", fw: 700, children: [label, " #", idx + 1] }), _jsx(Button, { size: "xs", variant: "subtle", color: "red", onClick: () => update(items.filter((_, i) => i !== idx)), children: "Remove" })] }), _jsx(ObjectField, { label: objectField.label, fields: objectField.fields, value: item, onChange: (next) => {
                                                             const nextItems = [...items];
                                                             nextItems[idx] = next;
                                                             update(nextItems);
                                                         }, renderField: renderField, path: [...path, idx], dataCanopyField: normalizeCanopyPath([...path, idx]) })] }) }, fieldKey([...path, idx])))), items.length === 0 && (_jsx(Text, { size: "xs", c: "dimmed", children: "No items yet. Add one to get started." }))] })] }) }, fieldKey(path)));
                 }
-                return (_jsx(ObjectField, { label: label, fields: objectField.fields, value: currentValue, onChange: (next) => update(next), renderField: renderField, path: path, dataCanopyField: normalizeCanopyPath(path) }, fieldKey(path)));
+                // Non-list object: unlike the list branch above (where each item has
+                // its own Remove button), this field had no way to return to
+                // `undefined` once given a value. That mattered because a required
+                // child field inside it can be filled and then cleared back to `''`,
+                // which `isEmptyForRequired` treats as empty (entry-validator.ts) --
+                // but the object as a whole only reads as "absent" when it is
+                // `undefined`/`null`, not when its children are individually empty.
+                // Without a way to unset the object, that state was permanently
+                // invalid. The Clear button (wired through ObjectField's onRemove)
+                // fixes that by resetting to `undefined`, never `{}` (which would
+                // still carry a required-but-empty child into validation).
+                //
+                // Shown only when the field is optional (a required object should
+                // not be clearable back to a missing state) and only once it
+                // actually has a value (nothing to clear otherwise). Labeled
+                // "Clear" rather than "Remove" so it doesn't read as deleting the
+                // field from the schema, the way "Remove" correctly does for a list
+                // item above.
+                const hasValue = currentValue !== undefined && currentValue !== null;
+                const canClear = objectField.required !== true && hasValue;
+                return wrapWithComments(_jsx(ObjectField, { label: label, fields: objectField.fields, value: currentValue, onChange: (next) => update(next), onRemove: canClear ? () => update(undefined) : undefined, renderField: renderField, path: path, dataCanopyField: normalizeCanopyPath(path) }, fieldKey(path)));
             }
             case 'code':
                 return wrapWithComments(_jsx(CodeField, { id: fieldId, label: label, value: typeof currentValue === 'string' ? currentValue : '', onChange: (v) => update(v), dataCanopyField: normalizeCanopyPath(path) }, fieldKey(path)));
@@ -165,4 +185,3 @@ export const FormRenderer = ({ fields, value, onChange, customRenderers, branch
             })] }));
 };
 export default FormRenderer;
-//# sourceMappingURL=FormRenderer.js.map

package/dist/editor/GroupManager.d.ts

@@ -2,6 +2,5 @@
  * GroupManager - Re-exports from the group-manager module.
  * This file maintains backward compatibility with existing imports.
  */
-export { GroupManager, useGroupState, useUserSearch, useExternalGroupSearch } from './group-manager';
-export type { GroupManagerProps, InternalGroup } from './group-manager';
-//# sourceMappingURL=GroupManager.d.ts.map
+export { GroupManager, useGroupState, useUserSearch, useExternalGroupSearch } from './group-manager/index.js';
+export type { GroupManagerProps, InternalGroup } from './group-manager/index.js';

package/dist/editor/GroupManager.js

@@ -4,4 +4,3 @@
  * This file maintains backward compatibility with existing imports.
  */
 export { GroupManager, useGroupState, useUserSearch, useExternalGroupSearch } from './group-manager/index.js';
-//# sourceMappingURL=GroupManager.js.map

package/dist/editor/PermissionManager.d.ts

@@ -4,6 +4,5 @@
  * This file maintains backward compatibility for imports.
  * The actual implementation is in ./permission-manager/
  */
-export { PermissionManager, usePermissionTree, useGroupsAndUsers } from './permission-manager';
-export type { PermissionManagerProps, ContentNode, TreeNode } from './permission-manager';
-//# sourceMappingURL=PermissionManager.d.ts.map
+export { PermissionManager, usePermissionTree, useGroupsAndUsers } from './permission-manager/index.js';
+export type { PermissionManagerProps, ContentNode, TreeNode } from './permission-manager/index.js';

package/dist/editor/PermissionManager.js

@@ -6,4 +6,3 @@
  * The actual implementation is in ./permission-manager/
  */
 export { PermissionManager, usePermissionTree, useGroupsAndUsers } from './permission-manager/index.js';
-//# sourceMappingURL=PermissionManager.js.map

package/dist/editor/admin/SystemHealthPanel.d.ts

@@ -3,4 +3,3 @@ export interface SystemHealthPanelProps {
     onClose: () => void;
 }
 export declare function SystemHealthPanel({ opened, onClose }: SystemHealthPanelProps): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=SystemHealthPanel.d.ts.map

package/dist/editor/admin/SystemHealthPanel.js

@@ -236,4 +236,3 @@ function BranchHealthRow({ entry, onMarkMerged, onRepair, onPurge, }) {
     const purgeGate = purgeGateFor(entry);
     return (_jsxs(Table.Tr, { style: { opacity: 0.65 }, children: [_jsx(Table.Td, { children: entry.dirName }), _jsx(Table.Td, { children: _jsx(Badge, { color: "gray", variant: "outline", children: "orphan" }) }), _jsx(Table.Td, { colSpan: 3, children: _jsxs(Text, { size: "xs", c: "dimmed", children: [entry.ageMs !== undefined ? `${formatAgeMs(entry.ageMs)} old` : 'unknown age', " \u00B7", ' ', entry.hasGitDir ? 'has .git' : 'no .git'] }) }), _jsx(Table.Td, { children: _jsx(Text, { size: "xs", c: "dimmed", children: entry.dirMtime ?? '—' }) }), _jsx(Table.Td, { children: _jsx(Tooltip, { label: purgeGate.tooltip, disabled: !purgeGate.disabled, children: _jsx("span", { children: _jsx(Button, { size: "xs", variant: "light", color: "red", disabled: purgeGate.disabled, "data-testid": `purge-dir-${entry.dirName}`, onClick: () => onPurge(entry.dirName), children: "Purge" }) }) }) })] }));
 }
-//# sourceMappingURL=SystemHealthPanel.js.map

package/dist/editor/admin/useSystemHealth.d.ts

@@ -1,5 +1,5 @@
-import type { AdminStatusData, AdminTasksData, ListAdminTasksParams, DeleteTaskParams } from '../../api/admin';
-import type { BranchHealthData } from '../../api/admin-branch-health';
+import type { AdminStatusData, AdminTasksData, ListAdminTasksParams, DeleteTaskParams } from '../../api/admin.js';
+import type { BranchHealthData } from '../../api/admin-branch-health.js';
 export type AdminTaskStatus = ListAdminTasksParams['status'];
 export type DeletableTaskStatus = DeleteTaskParams['status'];
 export interface UseSystemHealthOptions {
@@ -37,4 +37,3 @@ export interface UseSystemHealthReturn {
     markMerged: (branchName: string) => Promise<void>;
 }
 export declare function useSystemHealth(options: UseSystemHealthOptions): UseSystemHealthReturn;
-//# sourceMappingURL=useSystemHealth.d.ts.map

package/dist/editor/admin/useSystemHealth.js

@@ -202,4 +202,3 @@ export function useSystemHealth(options) {
         markMerged,
     };
 }
-//# sourceMappingURL=useSystemHealth.js.map

package/dist/editor/canopy-path.d.ts

@@ -14,4 +14,3 @@ export declare const parseCanopyPath: (path: string) => CanopyPathSegment[];
  * canonical bracketed representation.
  */
 export declare const normalizeCanopyPath: (input: string | CanopyPathSegment[]) => string;
-//# sourceMappingURL=canopy-path.d.ts.map

package/dist/editor/canopy-path.js

@@ -46,4 +46,3 @@ export const normalizeCanopyPath = (input) => {
     }
     return formatCanopyPath(parseCanopyPath(input));
 };
-//# sourceMappingURL=canopy-path.js.map