canopycms 0.0.68-int.97 → 0.0.68-int.98

package/README.md

@@ -388,7 +388,7 @@ import config from '../canopycms.config'
 export default CanopyEditorPage(config)
 ```
 
-The editor loads entries on the client from `/api/canopycms/[branch]/entries`, so server prefetch is optional. Use `previewBaseByCollection` to control preview URLs per collection.
+The editor loads entries on the client from `/api/canopycms/[branch]/entries`, so server prefetch is optional. Use `editor.previewBase` to override preview URLs.
 
 6. **Theme it**
    Wrap editor surfaces with `CanopyCMSProvider` to load Mantine styles and customize `brand`/`primary`/`neutral`/`accent` colors and color scheme. Pass `themeOptions` into `Editor` if desired.
@@ -402,7 +402,7 @@ _TODO_ show real examples of what to do
 
 ### Preview branch awareness
 
-- When building preview URLs, include the current branch as a query param (e.g., `/?branch=feature-foo` or `/posts/hello?branch=feature-foo`) so SSR preview pages read from the same branch workspace the editor is editing. The `Editor` component appends the branch param automatically to `previewBaseByCollection`; your page loaders should read `searchParams.branch` and pass it as the `branch` option to `getCanopy()`'s `read`/`readByUrlPath`.
+- When building preview URLs, include the current branch as a query param (e.g., `/?branch=feature-foo` or `/posts/hello?branch=feature-foo`) so SSR preview pages read from the same branch workspace the editor is editing. The `Editor` component appends the branch param to the preview URLs it builds; your page loaders should read `searchParams.branch` and pass it as the `branch` option to `getCanopy()`'s `read`/`readByUrlPath`.
 - For public static builds, omit/ignore the branch param; this pattern is only for the editor/preview environment.
 - Likewise, include `branch` in your editor route (e.g., `/edit?branch=feature-foo`) and have your editor page pass it to `<Editor>` so reloads/links preserve the selected branch. The `Editor` will also reflect branch switches back into the query string.
 

package/dist/api/branch.d.ts

@@ -45,6 +45,14 @@ export interface BranchListItem extends BranchMetadata {
      */
     submitBlocked?: boolean;
 }
+/**
+ * Response type for branch creation. Carries the list-item shape (server-computed
+ * flags included) so the editor can insert the branch without waiting for a
+ * listing that may lag behind the create.
+ */
+export type BranchCreateResponse = ApiResponse<{
+    branch: BranchListItem;
+}>;
 /** Response type for listing branches */
 export type BranchListResponse = ApiResponse<{
     branches: BranchListItem[];
@@ -130,7 +138,7 @@ export interface CreateBranchBody {
     access?: BranchMetadata['access'];
 }
 /** @internal Exported for tests. */
-export declare const createBranchHandler: (ctx: ApiContext, req: ApiRequest, body: z.infer<typeof createBranchBodySchema>) => Promise<BranchResponse>;
+export declare const createBranchHandler: (ctx: ApiContext, req: ApiRequest, body: z.infer<typeof createBranchBodySchema>) => Promise<BranchCreateResponse>;
 /** @internal Exported for tests. */
 export declare const listBranchesHandler: (ctx: ApiContext, req: ApiRequest) => Promise<BranchListResponse>;
 /** @internal Exported for tests. */
@@ -187,7 +195,7 @@ export declare const BRANCH_ROUTES: {
             allowedUsers?: string[] | undefined;
             allowedGroups?: string[] | undefined;
         } | undefined;
-    }>, BranchResponse>;
+    }>, BranchCreateResponse>;
     readonly delete: import("./route-builder.js").RouteDefinition<z.ZodObject<{
         branch: z.ZodType<import("../paths/index.js").BranchName, z.ZodTypeDef, import("../paths/index.js").BranchName>;
     }, "strip", z.ZodTypeAny, {

package/dist/api/branch.js

@@ -87,6 +87,20 @@ const resolveReadOnlyMirrorPath = (ctx, strategy) => {
         process.env[remoteUrlConfig.envVarName] ??
         remoteUrlConfig.autoDetectRemotePath);
 };
+/**
+ * Attach server-computed protected-base-branch flags to a branch. Reads config
+ * per call so dev-mode refreshActiveBranch() updates are reflected.
+ */
+const toBranchListItem = (config, context) => {
+    const protection = getBranchWriteProtection(config, context.branch.name, context.branch.baseBranch, context.branch.status);
+    return {
+        ...context.branch,
+        isProtected: protection.isProtected,
+        readOnly: protection.readOnly,
+        writeBlocked: protection.writeBlocked,
+        submitBlocked: protection.submitBlockedIncludingStatus,
+    };
+};
 /** @internal Exported for tests. */
 export const createBranchHandler = async (ctx, req, body) => {
     return log.timed('api', 'createBranch', async () => {
@@ -322,7 +336,11 @@ export const createBranchHandler = async (ctx, req, body) => {
             access: body.access,
         });
         log.debug('api', 'Branch created', { branchName: context.branch.name });
-        return { ok: true, status: 200, data: { branch: context.branch } };
+        return {
+            ok: true,
+            status: 200,
+            data: { branch: toBranchListItem(ctx.services.config, context) },
+        };
     });
 };
 /** @internal Exported for tests. */
@@ -345,24 +363,15 @@ export const listBranchesHandler = async (ctx, req) => {
     // editor matches defaultBranch against registry names, so return the form
     // that can actually be found there.
     const defaultBranch = sanitizeBranchName(ctx.services.config.defaultActiveBranch ?? ctx.services.config.defaultBaseBranch ?? 'main');
-    // Attach server-computed protected-base-branch flags; read config per-request
-    // so dev-mode refreshActiveBranch() updates are reflected here too.
-    const toListItem = (context) => {
-        const protection = getBranchWriteProtection(ctx.services.config, context.branch.name, context.branch.baseBranch, context.branch.status);
-        return {
-            ...context.branch,
-            isProtected: protection.isProtected,
-            readOnly: protection.readOnly,
-            writeBlocked: protection.writeBlocked,
-            submitBlocked: protection.submitBlockedIncludingStatus,
-        };
-    };
     // Admins and Reviewers see all branches
     if (isPrivileged(req.user.groups)) {
         return {
             ok: true,
             status: 200,
-            data: { branches: allBranches.map(toListItem), defaultBranch },
+            data: {
+                branches: allBranches.map((context) => toBranchListItem(ctx.services.config, context)),
+                defaultBranch,
+            },
         };
     }
     // Regular users only see branches they created or have explicit access to
@@ -390,7 +399,10 @@ export const listBranchesHandler = async (ctx, req) => {
     return {
         ok: true,
         status: 200,
-        data: { branches: visibleBranches.map(toListItem), defaultBranch },
+        data: {
+            branches: visibleBranches.map((context) => toBranchListItem(ctx.services.config, context)),
+            defaultBranch,
+        },
     };
 };
 /** @internal Exported for tests. */
@@ -646,7 +658,7 @@ const createBranch = defineEndpoint({
     path: '/branches',
     body: createBranchBodySchema,
     bodyType: 'CreateBranchBody',
-    responseType: 'BranchResponse',
+    responseType: 'BranchCreateResponse',
     response: {},
     defaultMockData: {
         branch: {

package/dist/api/client.d.ts

@@ -5,7 +5,7 @@
  * AUTO-GENERATED by scripts/generate-client.ts; do not edit this file manually
  * (changes will be overwritten), edit the generator's templates instead.
  */
-import type { BranchDeleteResponse, BranchListResponse, BranchResponse, CreateBranchBody, UpdateBranchAccessBody } from './branch.js';
+import type { BranchCreateResponse, BranchDeleteResponse, BranchListResponse, BranchResponse, CreateBranchBody, UpdateBranchAccessBody } from './branch.js';
 import type { BranchMergeResponse } from './branch-status.js';
 import type { AddCommentBody, AddCommentResponse, CommentsResponse, ResolveCommentResponse } from './comments.js';
 import type { ContentReadResponse, ContentWriteResponse, ReferenceValidationResponse, RenameEntryBody, RenameEntryResponse, ValidateReferencesBody, WriteContentBody } from './content.js';
@@ -56,7 +56,7 @@ export declare class CanopyApiClient {
         /** GET /branches */
         list: () => Promise<BranchListResponse>;
         /** POST /branches */
-        create: (body: CreateBranchBody) => Promise<BranchResponse>;
+        create: (body: CreateBranchBody) => Promise<BranchCreateResponse>;
         /** DELETE /:branch */
         delete: (params: Record<string, string>) => Promise<BranchDeleteResponse>;
         /** PATCH /:branch/access */

package/dist/api/client.js

@@ -326,10 +326,21 @@ export class CanopyApiClient {
         if (requestBody !== undefined) {
             init.body = requestBody;
         }
-        const response = await this.fetchFn(url, init);
+        let response = await this.fetchFn(url, init);
         // A body from in front of the API (a proxy or CDN error page) may be empty, not JSON, or
         // not an ApiResponse; every such body becomes an `ok: false` ApiResponse, never a throw.
-        const parsed = await response.json().catch(() => undefined);
+        let parsed = await response.json().catch(() => undefined);
+        // A 429 no handler wrote is a throttle in front of the API, such as Lambda's concurrency
+        // cap, which answers before the function runs. The request was never handled, so
+        // resending it is safe for writes too.
+        for (let attempt = 0; response.status === 429 && !isApiResponseBody(parsed); attempt++) {
+            const delay = throttleRetryDelayMs(response, attempt);
+            if (delay === undefined)
+                break;
+            await sleep(delay);
+            response = await this.fetchFn(url, init);
+            parsed = await response.json().catch(() => undefined);
+        }
         if (response.status === 401) {
             this.onUnauthorized?.();
             return { ok: false, status: 401, error: errorFromBody(parsed) ?? 'Unauthorized' };
@@ -345,6 +356,36 @@ export class CanopyApiClient {
         return converted;
     }
 }
+/**
+ * Base wait before each resend of a throttled request. A throttle from a burst of cold starts
+ * clears as they finish, so the waits span a few seconds.
+ */
+const THROTTLE_RETRY_DELAYS_MS = [250, 1000, 3000];
+/** The longest `Retry-After` waited; a throttle asking for longer is reported, not resent. */
+const MAX_RETRY_AFTER_MS = 5000;
+/**
+ * The wait before resend `attempt`, or undefined when there is to be no resend: the attempts
+ * are used up, or `Retry-After` asks for longer than {@link MAX_RETRY_AFTER_MS}. Without a
+ * `Retry-After`, the base delay plus up to half again, so throttled requests do not resend in
+ * lockstep.
+ */
+function throttleRetryDelayMs(response, attempt) {
+    const base = THROTTLE_RETRY_DELAYS_MS[attempt];
+    if (base === undefined)
+        return undefined;
+    // Delta-seconds only; an HTTP-date or a blank value falls back to the base delay. A custom
+    // `fetch` option may return a Response-like without headers.
+    const header = response.headers?.get('retry-after')?.trim();
+    const retryAfter = header ? Number(header) : Number.NaN;
+    if (Number.isFinite(retryAfter) && retryAfter >= 0) {
+        const ms = retryAfter * 1000;
+        return ms > MAX_RETRY_AFTER_MS ? undefined : ms;
+    }
+    return base + Math.random() * base * 0.5;
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 const convertedResponses = new WeakSet();
 /**
  * Whether `result` was converted from a body no CanopyCMS handler wrote (a proxy or CDN

package/dist/api/index.d.ts

@@ -1,5 +1,5 @@
 export type { ApiResponse, ApiRequest, ApiContext } from './types.js';
-export type { BranchResponse, BranchListResponse, BranchDeleteResponse, CreateBranchBody, UpdateBranchAccessBody, } from './branch.js';
+export type { BranchResponse, BranchCreateResponse, BranchListResponse, BranchDeleteResponse, CreateBranchBody, UpdateBranchAccessBody, } from './branch.js';
 export type { BranchMergeResponse } from './branch-merge.js';
 export type { CommentsResponse, AddCommentResponse, ResolveCommentResponse } from './comments.js';
 export type { EntriesResponse, ListEntriesResponse, CollectionItem, ListEntriesParams, DeleteEntryResponse, } from './entries.js';

package/dist/cli/cli.js

@@ -1443,7 +1443,7 @@ var init_init = __esm({
           title: z5.string().optional(),
           subtitle: z5.string().optional(),
           theme: z5.unknown().optional(),
-          previewBase: z5.record(z5.string()).optional(),
+          previewBase: z5.record(z5.union([z5.string(), z5.literal(false)])).optional(),
           previewPrefix: previewPrefixSchema.optional(),
           // UI handler functions (runtime only, don't serialize)
           onAccountClick: z5.function().returns(z5.void()).optional(),
@@ -6233,7 +6233,7 @@ var init_generate_ai_content = __esm({
           title: z62.string().optional(),
           subtitle: z62.string().optional(),
           theme: z62.unknown().optional(),
-          previewBase: z62.record(z62.string()).optional(),
+          previewBase: z62.record(z62.union([z62.string(), z62.literal(false)])).optional(),
           previewPrefix: previewPrefixSchema2.optional(),
           // UI handler functions (runtime only, don't serialize)
           onAccountClick: z62.function().returns(z62.void()).optional(),
@@ -10902,7 +10902,7 @@ var init_config4 = __esm({
       title: z14.string().optional(),
       subtitle: z14.string().optional(),
       theme: z14.unknown().optional(),
-      previewBase: z14.record(z14.string()).optional(),
+      previewBase: z14.record(z14.union([z14.string(), z14.literal(false)])).optional(),
       previewPrefix: previewPrefixSchema3.optional(),
       // UI handler functions (runtime only, don't serialize)
       onAccountClick: z14.function().returns(z14.void()).optional(),

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

@@ -481,7 +481,7 @@ var init_config = __esm({
       title: z6.string().optional(),
       subtitle: z6.string().optional(),
       theme: z6.unknown().optional(),
-      previewBase: z6.record(z6.string()).optional(),
+      previewBase: z6.record(z6.union([z6.string(), z6.literal(false)])).optional(),
       previewPrefix: previewPrefixSchema.optional(),
       // UI handler functions (runtime only, don't serialize)
       onAccountClick: z6.function().returns(z6.void()).optional(),

package/dist/cli/init.js

@@ -334,7 +334,7 @@ var init_config = __esm({
       title: z5.string().optional(),
       subtitle: z5.string().optional(),
       theme: z5.unknown().optional(),
-      previewBase: z5.record(z5.string()).optional(),
+      previewBase: z5.record(z5.union([z5.string(), z5.literal(false)])).optional(),
       previewPrefix: previewPrefixSchema.optional(),
       // UI handler functions (runtime only, don't serialize)
       onAccountClick: z5.function().returns(z5.void()).optional(),

package/dist/cli/template-files/cms-stack.ts.template

@@ -192,7 +192,10 @@ export class CmsStack extends Stack {
       },
 
       memorySize: 2048,
-      reservedConcurrency: 10,
+      // A ceiling, free while idle. The editor's static chunks count against it
+      // until CloudFront caches them, and a cold editor load requests them
+      // together, so synth warns below 20. See the prop's doc comment.
+      reservedConcurrency: 50,
     })
 
     // Media support (uploads, on-demand image transforms). To enable it:

package/dist/config/schemas/config.d.ts

@@ -84,7 +84,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
         title: z.ZodOptional<z.ZodString>;
         subtitle: z.ZodOptional<z.ZodString>;
         theme: z.ZodOptional<z.ZodUnknown>;
-        previewBase: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        previewBase: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodLiteral<false>]>>>;
         previewPrefix: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
         onAccountClick: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodVoid>>;
         onLogoutClick: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodVoid>>;
@@ -94,7 +94,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
         title?: string | undefined;
         subtitle?: string | undefined;
         theme?: unknown;
-        previewBase?: Record<string, string> | undefined;
+        previewBase?: Record<string, string | false> | undefined;
         previewPrefix?: string | undefined;
         onAccountClick?: ((...args: unknown[]) => void) | undefined;
         onLogoutClick?: ((...args: unknown[]) => void) | undefined;
@@ -104,7 +104,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
         title?: string | undefined;
         subtitle?: string | undefined;
         theme?: unknown;
-        previewBase?: Record<string, string> | undefined;
+        previewBase?: Record<string, string | false> | undefined;
         previewPrefix?: string | undefined;
         onAccountClick?: ((...args: unknown[]) => void) | undefined;
         onLogoutClick?: ((...args: unknown[]) => void) | undefined;
@@ -167,7 +167,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
         title?: string | undefined;
         subtitle?: string | undefined;
         theme?: unknown;
-        previewBase?: Record<string, string> | undefined;
+        previewBase?: Record<string, string | false> | undefined;
         previewPrefix?: string | undefined;
         onAccountClick?: ((...args: unknown[]) => void) | undefined;
         onLogoutClick?: ((...args: unknown[]) => void) | undefined;
@@ -223,7 +223,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
         title?: string | undefined;
         subtitle?: string | undefined;
         theme?: unknown;
-        previewBase?: Record<string, string> | undefined;
+        previewBase?: Record<string, string | false> | undefined;
         previewPrefix?: string | undefined;
         onAccountClick?: ((...args: unknown[]) => void) | undefined;
         onLogoutClick?: ((...args: unknown[]) => void) | undefined;

package/dist/config/schemas/config.js

@@ -51,7 +51,7 @@ const editorConfigSchema = z.object({
     title: z.string().optional(),
     subtitle: z.string().optional(),
     theme: z.unknown().optional(),
-    previewBase: z.record(z.string()).optional(),
+    previewBase: z.record(z.union([z.string(), z.literal(false)])).optional(),
     previewPrefix: previewPrefixSchema.optional(),
     // UI handler functions (runtime only, don't serialize)
     onAccountClick: z.function().returns(z.void()).optional(),

package/dist/config/types.d.ts

@@ -257,18 +257,15 @@ export interface CanopyEditorConfig {
     subtitle?: string;
     theme?: unknown;
     /**
-     * Per-collection overrides for the preview pane's URL, keyed by collection path or name
-     * (e.g. `{ 'content/posts': '/blog' }`) for sites whose routes don't mirror their content tree.
+     * Preview-pane routes for sites whose routes don't mirror their content tree; otherwise an entry
+     * previews its own `urlPath`. Keyed by a root entry's path (the whole route), else collection
+     * path or name (plus the slug). `false` means no page, and the pane says so instead of framing one.
      *
-     * Values are **site-relative** and must NOT include the deployment `basePath` — that is applied
-     * on top of whatever this yields (see `CanopyConfig.basePath`), so including it here would
-     * prefix it twice. An absolute value (`https://…`) gets only the slug and `?branch=`, with no
-     * `basePath`, `previewPrefix` or trailing-slash change: the escape hatch for previewing against a
-     * different origin entirely.
-     *
-     * A site-relative value is a route on the host site, so `previewPrefix` is applied to it too.
+     * Values are **site-relative**, without the deployment `basePath` (applied on top, so including
+     * it prefixes it twice), and get `previewPrefix` too. An absolute value (`https://…`) gets no
+     * prefix, only the slug (for a collection key) and `?branch=`: for previewing another origin.
      */
-    previewBase?: Record<string, string>;
+    previewBase?: Record<string, string | false>;
     /**
      * Where the host mounts the pages the preview pane loads, put in front of every entry's preview
      * URL (`'/preview'` makes `/blog/hello` load `/preview/blog/hello`). Set it when the site's

package/dist/editor/BranchManager.d.ts

@@ -62,11 +62,15 @@ export interface BranchManagerProps {
     /** Current user context for permission checks */
     user?: UserContext;
     onSelect?: (name: string) => void;
+    /**
+     * Resolving `false` means the branch was not created, so the form stays open
+     * with the user's values; any other return (including none) closes it.
+     */
     onCreate?: (branch: {
         name: string;
         title?: string;
         description?: string;
-    }) => void;
+    }) => Promise<boolean> | void;
     onDelete?: (name: string) => void;
     onSubmit?: (name: string) => void;
     onWithdraw?: (name: string) => void;

package/dist/editor/BranchManager.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useRef, useState } from 'react';
 import { Badge, Button, Group, Paper, ScrollArea, Stack, Text, TextInput, Textarea, Collapse, Tooltip, } from '@mantine/core';
 import { BranchComments } from './comments/BranchComments.js';
 import { UserBadge } from './components/UserBadge.js';
@@ -82,20 +82,33 @@ export const BranchManager = ({ branches, mode, user, onSelect, onCreate, onDele
     const [newBranchName, setNewBranchName] = useState('');
     const [newBranchTitle, setNewBranchTitle] = useState('');
     const [newBranchDescription, setNewBranchDescription] = useState('');
-    const handleCreate = () => {
-        if (!newBranchName.trim())
+    const [creating, setCreating] = useState(false);
+    // Read synchronously: state would not yet show a first click to a second one in the same tick.
+    const creatingRef = useRef(false);
+    const handleCreate = async () => {
+        if (creatingRef.current || !newBranchName.trim())
             return;
-        onCreate?.({
-            name: newBranchName.trim(),
-            title: newBranchTitle.trim() || undefined,
-            description: newBranchDescription.trim() || undefined,
-        });
-        setNewBranchName('');
-        setNewBranchTitle('');
-        setNewBranchDescription('');
-        setShowCreateForm(false);
+        creatingRef.current = true;
+        setCreating(true);
+        try {
+            const created = await onCreate?.({
+                name: newBranchName.trim(),
+                title: newBranchTitle.trim() || undefined,
+                description: newBranchDescription.trim() || undefined,
+            });
+            if (created === false)
+                return;
+            setNewBranchName('');
+            setNewBranchTitle('');
+            setNewBranchDescription('');
+            setShowCreateForm(false);
+        }
+        finally {
+            creatingRef.current = false;
+            setCreating(false);
+        }
     };
-    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "branch-manager", children: [currentUserId && onAddComment && onResolveThread && (_jsx(Stack, { pt: "sm", children: _jsx(BranchComments, { comments: comments, currentUserId: currentUserId, canResolve: canResolve, onAddComment: onAddComment, onResolveThread: onResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: onGetUserMetadata }) })), !!supportsBranching && (_jsxs(Stack, { gap: "sm", pt: "sm", children: [_jsx(Button, { variant: "light", size: "sm", fullWidth: true, onClick: () => setShowCreateForm(!showCreateForm), "data-testid": "create-branch-button", children: showCreateForm ? 'Cancel' : 'Create New Branch' }), _jsx(Collapse, { in: showCreateForm, children: _jsx(Paper, { withBorder: true, p: "md", radius: "md", children: _jsxs(Stack, { gap: "sm", children: [_jsx(TextInput, { label: "Branch Name", placeholder: "feature/my-branch", value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title (optional)", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description (optional)", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, "data-testid": "branch-description-textarea" }), _jsx(Button, { onClick: handleCreate, disabled: !newBranchName.trim(), fullWidth: true, "data-testid": "create-branch-submit", children: "Create Branch" })] }) }) })] })), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsx(Stack, { gap: "sm", children: branches.map((b) => {
+    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "branch-manager", children: [currentUserId && onAddComment && onResolveThread && (_jsx(Stack, { pt: "sm", children: _jsx(BranchComments, { comments: comments, currentUserId: currentUserId, canResolve: canResolve, onAddComment: onAddComment, onResolveThread: onResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: onGetUserMetadata }) })), !!supportsBranching && (_jsxs(Stack, { gap: "sm", pt: "sm", children: [_jsx(Button, { variant: "light", size: "sm", fullWidth: true, onClick: () => setShowCreateForm(!showCreateForm), disabled: creating, "data-testid": "create-branch-button", children: showCreateForm ? 'Cancel' : 'Create New Branch' }), _jsx(Collapse, { in: showCreateForm, children: _jsx(Paper, { withBorder: true, p: "md", radius: "md", children: _jsxs(Stack, { gap: "sm", children: [_jsx(TextInput, { label: "Branch Name", placeholder: "feature/my-branch", value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, disabled: creating, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title (optional)", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), disabled: creating, "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description (optional)", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, disabled: creating, "data-testid": "branch-description-textarea" }), _jsx(Button, { onClick: handleCreate, disabled: !newBranchName.trim(), loading: creating, fullWidth: true, "data-testid": "create-branch-submit", children: "Create Branch" })] }) }) })] })), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsx(Stack, { gap: "sm", children: branches.map((b) => {
                         const statusColor = statusColorMap[b.status] ?? {
                             color: 'neutral',
                             variant: 'light',

package/dist/editor/CanopyEditor.js

@@ -4,13 +4,9 @@ import { useMemo } from 'react';
 import { Editor } from './Editor.js';
 import { ApiClientProvider } from './context/index.js';
 import { EditorAuthGate } from './EditorAuthGate.js';
-import { buildEditorCollections, buildPreviewBaseByCollection } from './editor-config.js';
+import { buildEditorCollections } from './editor-config.js';
 export const CanopyEditor = ({ config, entries = [], initialSelectedId, initialValues, renderPreview, onCreateEntry, branchName, customRenderers, }) => {
     const collections = useMemo(() => buildEditorCollections(config.flatSchema), [config.flatSchema]);
-    const previewBase = useMemo(() => ({
-        ...buildPreviewBaseByCollection(config, config.flatSchema),
-        ...(config.editor?.previewBase ?? {}),
-    }), [config]);
     // Empty string = branchless start; useBranchManager adopts the server's
     // detected default branch on the first branches.list() load.
     const resolvedBranchName = branchName ?? config.defaultActiveBranch ?? config.defaultBaseBranch ?? '';
@@ -19,6 +15,6 @@ export const CanopyEditor = ({ config, entries = [], initialSelectedId, initialV
     const resolvedTheme = config.editor?.theme ?? undefined;
     // The gate owns the SWRProvider (keyed by user id), so it sits between the API client and the
     // editor: see EditorAuthGate for what a signed-out or lapsed session renders.
-    return (_jsx(ApiClientProvider, { basePath: config.basePath, children: _jsx(EditorAuthGate, { SignInComponent: config.editor?.SignInComponent, themeOptions: resolvedTheme, 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, previewPrefix: config.editor?.previewPrefix, assetBaseUrl: config.assetBaseUrl, basePath: config.basePath, themeOptions: resolvedTheme, AccountComponent: config.editor?.AccountComponent, onAccountClick: config.editor?.onAccountClick, onLogoutClick: config.editor?.onLogoutClick }) }) }));
+    return (_jsx(ApiClientProvider, { basePath: config.basePath, children: _jsx(EditorAuthGate, { SignInComponent: config.editor?.SignInComponent, themeOptions: resolvedTheme, 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: config.editor?.previewBase, previewPrefix: config.editor?.previewPrefix, assetBaseUrl: config.assetBaseUrl, basePath: config.basePath, themeOptions: resolvedTheme, AccountComponent: config.editor?.AccountComponent, onAccountClick: config.editor?.onAccountClick, onLogoutClick: config.editor?.onLogoutClick }) }) }));
 };
 export default CanopyEditor;

package/dist/editor/Editor.d.ts

@@ -57,7 +57,8 @@ export interface EditorProps {
     renderPreview?: (entry: EditorEntry, value: FormValue | undefined) => React.ReactNode;
     onCreateEntry?: (collectionPath: LogicalPath) => Promise<void> | void;
     themeOptions?: CanopyThemeOptions;
-    previewBaseByCollection?: Record<string, string>;
+    /** `editor.previewBase` from config (see `buildPreviewSrc`); `false` marks entries with no page. */
+    previewBaseByCollection?: Record<string, string | false>;
     /** `editor.previewPrefix` from config: put in front of every preview iframe `src` (see `buildPreviewSrc`). */
     previewPrefix?: string;
     currentUser?: string;

package/dist/editor/Editor.js

@@ -71,7 +71,7 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
     // Comments state (shared between useCommentSystem and useBranchManager)
     const [commentsForBranchSummaries, setCommentsForBranchSummaries] = useState([]);
     // 1. Branch manager (provides branchNameState, no dependencies)
-    const { branchName: branchNameState, setBranchName, branchSummaries, currentBranch, handleSubmit, handleWithdraw, handleRequestChanges, handleDelete, handleReloadBranchData, loadBranches, } = useBranchManager({
+    const { branchName: branchNameState, setBranchName, branchSummaries, currentBranch, addCreatedBranch, handleSubmit, handleWithdraw, handleRequestChanges, handleDelete, handleReloadBranchData, loadBranches, } = useBranchManager({
         initialBranch: branchName,
         operatingMode,
         setBusy: setBranchesLoading,
@@ -95,7 +95,6 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
         initialSelectedId,
         branchName: branchNameState,
         collections,
-        previewBaseByCollection,
         resolvePreviewSrc: (entry) => buildPreviewSrc(entry, {
             branchName: branchNameState,
             previewBaseByCollection,
@@ -147,6 +146,7 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
         setBranchName,
         isAnyDirty,
         onReloadBranches: () => loadBranches(),
+        onBranchCreated: addCreatedBranch,
     });
     // 5. Comment system (depends on branchNameState)
     const { comments, focusedFieldPath, highlightThreadId, commentsPanelOpen, setCommentsPanelOpen, handleAddComment, handleResolveThread, handleJumpToField, handleJumpToEntry, handleJumpToBranch, } = useCommentSystem({
@@ -608,7 +608,9 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
                 ? 'Setting up your branch workspace…'
                 : entriesInitializing
                     ? 'Loading content…'
-                    : 'Select an item to start editing.' }) }));
+                    : currentEntry && !currentEntry.previewSrc
+                        ? 'No preview for this entry.'
+                        : 'Select an item to start editing.' }) }));
     const sidebarWidth = 64;
     const footerHeight = 40;
     const headerTitle = currentEntry?.label ?? currentEntry?.slug ?? title;
@@ -672,9 +674,7 @@ export const Editor = ({ entries, title, subtitle, siteTitle = title, siteSubtit
                                     console.error('Branch change failed or was cancelled:', err);
                                     // Don't close branch manager if there was an error or user cancelled
                                 }
-                            }, onCreate: (branch) => {
-                                handleCreateBranch(branch).catch((err) => console.error(err));
-                            }, onSubmit: (name) => {
+                            }, onCreate: handleCreateBranch, onSubmit: (name) => {
                                 handleSubmit(name).catch((err) => console.error(err));
                             }, onWithdraw: (name) => {
                                 handleWithdraw(name).catch((err) => console.error(err));

package/dist/editor/editor-config.d.ts

@@ -1,4 +1,4 @@
-import type { CanopyConfig, FlatSchemaItem } from '../config/index.js';
+import type { FlatSchemaItem } from '../config/index.js';
 import type { EditorCollection } from './Editor.js';
 /**
  * Build hierarchical editor collections from the flattened schema.
@@ -10,4 +10,3 @@ import type { EditorCollection } from './Editor.js';
  * shown as separate nodes in the navigation tree.
  */
 export declare const buildEditorCollections: (flatSchema: FlatSchemaItem[]) => EditorCollection[];
-export declare const buildPreviewBaseByCollection: (config: Pick<CanopyConfig, "contentRoot">, flatSchema: FlatSchemaItem[]) => Record<string, string>;

package/dist/editor/editor-config.js

@@ -1,14 +1,3 @@
-import { trimSlashes } from '../paths/normalize.js';
-const normalizeContentRoot = (value) => {
-    return trimSlashes(value ?? 'content');
-};
-const stripContentRoot = (logicalPath, contentRoot) => {
-    const prefix = contentRoot ? `${contentRoot}/` : '';
-    if (prefix && logicalPath.startsWith(prefix)) {
-        return logicalPath.slice(prefix.length);
-    }
-    return logicalPath;
-};
 /**
  * Build hierarchical editor collections from the flattened schema.
  * Uses logicalPath as IDs to match API responses.
@@ -64,15 +53,3 @@ export const buildEditorCollections = (flatSchema) => {
     // This now includes the content root collection itself
     return buildTree(undefined);
 };
-export const buildPreviewBaseByCollection = (config, flatSchema) => {
-    const contentRoot = normalizeContentRoot(config.contentRoot);
-    const flat = flatSchema;
-    const map = {};
-    for (const item of flat) {
-        // Strip content root from all items and normalize to preview URL
-        const base = stripContentRoot(item.logicalPath, contentRoot);
-        const normalizedBase = base ? `/${base}` : '/';
-        map[item.logicalPath] = normalizedBase;
-    }
-    return map;
-};

package/dist/editor/editor-utils.d.ts

@@ -3,12 +3,10 @@ import type { ContentFormat, FlatSchemaItem } from '../config/index.js';
 import type { FormValue } from './FormRenderer.js';
 import type { EditorEntry, EditorCollection } from './Editor.js';
 import type { TreeNodeData } from '@mantine/core';
-import { normalizeCollectionPath } from '../paths/normalize.js';
-/** @internal Exported for tests. */
-export { normalizeCollectionPath };
 export interface PreviewContext {
     branchName?: string;
-    previewBaseByCollection?: Record<string, string>;
+    /** `editor.previewBase`: routes by root entry path, collection path or name; `false` is no page. */
+    previewBaseByCollection?: Record<string, string | false>;
     /** `editor.previewPrefix`: where the host mounts the pages the preview pane loads. */
     previewPrefix?: string;
 }
@@ -29,12 +27,14 @@ type PreviewEntry = {
  * The result must equal the framed page's own URL: the `<iframe src>` (`PreviewFrame` in
  * preview-bridge.tsx) 404s without the prefixes, and a URL the host redirects costs a round trip
  * on every load. `trailingSlash` defaults to the value `withCanopy` inlines at build time.
+ *
+ * `undefined` means the entry has no page, so the editor frames nothing rather than another page.
  */
 export declare const buildPreviewSrc: (entry: PreviewEntry, context: PreviewContext & {
     contentRoot?: string;
     basePath?: string;
     trailingSlash?: boolean;
-}) => string;
+}) => string | undefined;
 export declare const normalizeContentPayload: (raw: unknown) => FormValue;
 export declare const buildWritePayload: (entry: {
     collectionPath?: string;
@@ -43,7 +43,7 @@ export declare const buildWritePayload: (entry: {
 }, value: FormValue) => FormValue;
 interface BuildEntriesFromListParams {
     response: ListEntriesResponse;
-    resolvePreviewSrc: (entry: Pick<CollectionItem, 'collectionPath' | 'collectionName' | 'slug' | 'entryType'>) => string;
+    resolvePreviewSrc: (entry: Pick<CollectionItem, 'collectionPath' | 'collectionName' | 'slug' | 'entryType'>) => string | undefined;
     flatSchema: FlatSchemaItem[];
 }
 export declare const buildEntriesFromListResponse: ({ response, resolvePreviewSrc, flatSchema, }: BuildEntriesFromListParams) => EditorEntry[];
@@ -65,3 +65,4 @@ export declare const buildBreadcrumbSegments: (currentEntry: EditorEntry | undef
  * @returns Record<string, boolean> - Expanded state object where keys are collection node values
  */
 export declare const calculatePathToEntry: (entryPath: string | undefined, treeData: TreeNodeData[]) => Record<string, boolean>;
+export {};