@rigel-cms/rigel 0.1.4-beta.1 → 1.0.0-rc.1

package/README.md

@@ -2,8 +2,6 @@
 
 A CMS for Astro sites. You edit the text, git keeps the history.
 
-`@rigel-cms/rigel` is a beta package and a work in progress. Expect bugs and breaking changes.
-
 ## Collection validation
 
 New collection drafts initialize every configured field, including Rigel's automatic `description`, `metaTitle`, and `ogImage` strings. Existing content is never filled in automatically; unknown properties are preserved and missing optional fields remain allowed.
@@ -12,6 +10,10 @@ Rigel validates configured collection field types and `required: true` on load a
 
 Astro content schemas remain the host site's contract: Rigel does not discover or execute them. Align Rigel field types and requiredness with the host schema. For example, Astro's `z.string()` accepts an initialized empty description; `z.string().min(1)` also needs Rigel's `required: true`.
 
+## Media uploads
+
+Set `maxFileSize` in the `rigel()` options in `astro.config.mjs`. The value is bytes and defaults to `2 * 1024 * 1024` (2 MB). For example, `rigel({ maxFileSize: 50 * 1024 * 1024 })` allows 50 MB per file. The limit applies to uploads and downloaded image imports, not existing files or linked videos. Your host may impose its own limit.
+
 ## License
 
 [Apache-2.0](LICENSE). Copyright 2026 [Alex Zappa](https://alex.zappa.dev/) ([FreshJuice](https://freshjuice.dev/)).

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@rigel-cms/rigel",
-  "version": "0.1.4-beta.1",
+  "version": "1.0.0-rc.1",
   "publishConfig": {
     "access": "public",
-    "tag": "beta"
+    "tag": "rc"
   },
   "description": "Rigel CMS — the copy editor for Astro sites. Clients edit text, git keeps the history.",
   "author": {
@@ -32,8 +32,7 @@
   "scripts": {
     "build": "pnpm typecheck",
     "test": "vitest run",
-    "typecheck": "tsc --noEmit",
-    "publish:beta": "npm publish --access public --tag beta"
+    "typecheck": "tsc --noEmit"
   },
   "exports": {
     ".": "./src/index.ts",

package/src/article-body.ts

@@ -1,5 +1,6 @@
 import type { SerializedEditorState } from "lexical";
 import { safePreviewUrl } from "./preview-urls";
+import { safeEmbed } from "./editor/lib/embeds";
 
 export type ArticleBody = SerializedEditorState;
 export type ArticleNode = { type: string; version: number; children?: ArticleNode[]; text?: string; format?: number | string; tag?: string; listType?: string; start?: number; url?: string; src?: string; alt?: string; credit?: string; creditURL?: string; [key: string]: unknown };
@@ -12,7 +13,7 @@ export function emptyBody(): ArticleBody {
 }
 
 export function validateBody(value: unknown): asserts value is ArticleBody {
-  const types = new Set(["root", "paragraph", "heading", "quote", "list", "listitem", "code", "text", "linebreak", "link", "image", "divider", "table", "tablerow", "tablecell"]);
+  const types = new Set(["root", "paragraph", "heading", "quote", "list", "listitem", "code", "text", "linebreak", "link", "image", "video", "embed", "divider", "table", "tablerow", "tablecell"]);
   let count = 0;
   let textSize = 0;
   function check(raw: unknown, parent = "", depth = 0) {
@@ -43,9 +44,15 @@ export function validateBody(value: unknown): asserts value is ArticleBody {
     if (node.type === "image" && !safePreviewUrl(node.src!, true)) throw new Error("Unsafe image URL");
     if (node.type === "image" && node.url !== undefined && (typeof node.url !== "string" || node.url && !safePreviewUrl(node.url))) throw new Error("Unsafe image link URL");
     if (node.type === "link" && !safePreviewUrl(node.url!)) throw new Error("Unsafe link URL");
+    if (node.type === "video" && (typeof node.src !== "string" || !safePreviewUrl(node.src, true))) throw new Error("Unsafe video URL");
+    if (node.type === "video" && node.poster !== undefined && (typeof node.poster !== "string" || !safePreviewUrl(node.poster, true))) throw new Error("Unsafe video poster URL");
+    if (node.type === "video" && node.caption !== undefined && typeof node.caption !== "string") throw new Error("Invalid video caption");
+    if (node.type === "video") for (const key of ["muted", "controls"]) if (node[key] !== undefined && typeof node[key] !== "boolean") throw new Error("Invalid video playback setting");
+    if (node.type === "embed" && (!safeEmbed(node) || typeof node.privacy !== "boolean")) throw new Error("Invalid video embed");
+    if (node.type === "embed" && node.title !== undefined && typeof node.title !== "string") throw new Error("Invalid embed title");
     for (const key of ["credit", "creditURL"]) if (node[key] !== undefined && typeof node[key] !== "string") throw new Error("Invalid image credit");
     if (node.creditURL && !safePreviewUrl(node.creditURL)) throw new Error("Unsafe image credit URL");
-    if (!["text", "linebreak", "image", "divider"].includes(node.type)) {
+    if (!["text", "linebreak", "image", "video", "embed", "divider"].includes(node.type)) {
       if (!Array.isArray(node.children)) throw new Error("Article block requires children");
       for (const child of node.children) check(child, node.type, depth + 1);
       if (["table", "tablerow", "tablecell"].includes(node.type) && !node.children.length) throw new Error("Table elements cannot be empty");

package/src/article-render.ts

@@ -1,5 +1,6 @@
 import { validateBody, type ArticleBody, type ArticleNode } from "./article-body";
 import { safePreviewUrl } from "./preview-urls";
+import { embedSrc, embedWatchUrl, safeEmbed, embedProviderLabel } from "./editor/lib/embeds";
 
 const escape = (text: unknown) => String(text ?? "").replace(/[&<>"']/g, character => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[character]!);
 
@@ -10,7 +11,7 @@ function renderText(node: ArticleNode): string {
   return text;
 }
 
-export function renderArticle(body: ArticleBody): string {
+export function renderArticle(body: ArticleBody, options: { preview?: boolean } = {}): string {
   validateBody(body);
   function walk(node: ArticleNode): string {
     const content = () => (node.children ?? []).map(walk).join("");
@@ -32,6 +33,20 @@ export function renderArticle(body: ArticleBody): string {
     if (node.type === "tablecell") return Number(node.headerState) ? `<th scope="${Number(node.headerState) & 1 ? "col" : "row"}">${content()}</th>` : `<td>${content()}</td>`;
     if (node.type === "link") return safePreviewUrl(node.url!) ? `<a href="${escape(node.url)}">${content()}</a>` : content();
     if (node.type === "divider") return "<hr>";
+    if (node.type === "video") {
+      if (!safePreviewUrl(node.src!, true)) return "";
+      const poster = typeof node.poster === "string" && safePreviewUrl(node.poster, true) ? ` poster="${escape(node.poster)}"` : "";
+      const caption = node.caption ? `<figcaption>${escape(node.caption)}</figcaption>` : "";
+      return `<figure class="media-video"><video${node.controls !== false ? " controls" : ""}${node.muted === true ? " muted" : ""} preload="metadata" playsinline src="${escape(node.src)}"${poster}></video>${caption}</figure>`;
+    }
+    if (node.type === "embed") {
+      const ref = safeEmbed(node);
+      if (!ref) return "";
+      const title = escape(typeof node.title === "string" && node.title ? node.title : `${embedProviderLabel(ref)} video`);
+      if (options.preview) return `<figure data-rigel-embed="${ref.provider}" data-rigel-video-id="${ref.id}" data-rigel-video-title="${title}"></figure>`;
+      const src = escape(embedSrc(ref, node.privacy !== false));
+      return `<figure class="media-embed"><iframe src="${src}" title="${title}" loading="lazy" allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen referrerpolicy="strict-origin-when-cross-origin"></iframe></figure>`;
+    }
     if (node.type === "image") {
       if (!safePreviewUrl(node.src!, true)) return "";
       const credit = node.credit ? (node.creditURL && safePreviewUrl(node.creditURL) ? `<a href="${escape(node.creditURL)}">${escape(node.credit)}</a>` : escape(node.credit)) : "";
@@ -81,6 +96,17 @@ export function articleMarkdown(body: ArticleBody): string {
       return (node.url ? `[${image}](<${node.url.replace(/[<>]/g, character => encodeURIComponent(character))}>)` : image) + "\n\n";
     }
     if (node.type === "divider") return "---\n\n";
+    if (node.type === "video") {
+      if (!safePreviewUrl(node.src!, true)) return "";
+      const label = node.caption ? `Video: ${node.caption}` : "Video";
+      return `[${label}](<${node.src!.replace(/[<>]/g, character => encodeURIComponent(character))}>)\n\n`;
+    }
+    if (node.type === "embed") {
+      const ref = safeEmbed(node);
+      if (!ref) return "";
+      const label = typeof node.title === "string" && node.title ? node.title : `${embedProviderLabel(ref)} video`;
+      return `[${escaped(label)}](<${embedWatchUrl(ref)}>)\n\n`;
+    }
     return content();
   }
   return walk(body.root as unknown as ArticleNode).trimEnd() + "\n";

package/src/config.ts

@@ -4,12 +4,16 @@ import type { Schema } from "./schema/types";
 import { validateSidebar, type SidebarEntry } from "./manifest/navigation";
 import { withSeoFields } from "./manifest/seo";
 import { previewBaseUrl } from "./preview-urls";
+import type { JsonOutput } from "./json-output";
+import { DEFAULT_MAX_FILE_SIZE } from "./media-types";
 
 export interface RigelConfig {
   copyDir: string;
   mediaDir?: string;
+  maxFileSize?: number;
   preview?: import("./preview").PreviewConfig;
   backend: "local" | "github";
+  jsonOutput?: JsonOutput;
   demo?: boolean;
   collections?: CollectionConfig[];
   menus?: { folder: string; maxDepth?: number };
@@ -40,6 +44,10 @@ const DEFAULTS: Pick<RigelConfig, "copyDir" | "backend"> = {
 
 export function parseConfig(options: Partial<RigelConfig> = {}): RigelConfig {
   const cfg = { ...DEFAULTS, ...options };
+  if (cfg.maxFileSize === undefined) cfg.maxFileSize = DEFAULT_MAX_FILE_SIZE;
+  if (!Number.isSafeInteger(cfg.maxFileSize) || cfg.maxFileSize <= 0) throw new Error("rigel: maxFileSize must be a positive integer in bytes");
+  if (cfg.jsonOutput === undefined) cfg.jsonOutput = "pretty";
+  if (cfg.jsonOutput !== "pretty" && cfg.jsonOutput !== "minified") throw new Error("rigel: jsonOutput must be pretty or minified");
   if (cfg.demo === undefined) cfg.demo = true;
   if (typeof cfg.demo !== "boolean") throw new Error("rigel: demo must be boolean");
   if (cfg.preview) {

package/src/content.ts

@@ -2,4 +2,6 @@ export type { MenuItem, MenuDocument } from "./manifest/menu";
 export { defineCopy } from "./manifest/types";
 export type { CopyField, CopyGroup, CopyPage, Manifest, ManifestCollection } from "./manifest/types";
 export { defineSchema, defineDocument, defineObject, defineField } from "./schema/types";
-export type { Schema, DocumentDef, ObjectDef, FieldDef, ContentDocument } from "./schema/types";
+export type { Schema, DocumentDef, ObjectDef, FieldDef, ContentDocument } from "./schema/types";
+export { effectiveSlug } from "./slugs";
+export { pageRoute } from "./schema/paths";

package/src/editor/App.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onMount } from "svelte";
+  import { onMount, tick } from "svelte";
   import { tooltipRoot } from "./lib/tooltip";
   onMount(() => tooltipRoot(document.body).destroy);
   import type {
@@ -20,6 +20,7 @@
   import { isSeoField } from "../manifest/seo";
   import { initialCollectionValues } from "../manifest/collections";
   import { slugify } from "./lib/slugify";
+  import { effectiveSlug, normalizeUrlSlug } from "../slugs";
   import Icon from "./lib/Icon.svelte";
   import SidebarIcon from "./lib/SidebarIcon.svelte";
   import logo from "./assets/rigelcms-icon.png?url";
@@ -29,13 +30,14 @@
   import type { MenuItem } from "../manifest/menu";
   import UnsavedChanges from "./lib/UnsavedChanges.svelte";
   import ActionDialog from "./lib/ActionDialog.svelte";
+  import PublishDialog from "./lib/PublishDialog.svelte";
   import VisualEditor from "./lib/VisualEditor.svelte";
   import { newDocumentFromTemplate } from "../schema/paths";
   import { previewUrl } from "../preview";
   import type { ContentDocument, Schema } from "../schema/types";
   import { buildSidebar, navigationKey, type Selection } from "../manifest/navigation";
   import { startGitHubLogin, checkGitHubAccess, type GitHubAccess } from "./lib/github-auth";
-  import { loadManifestRemote, saveRemoteSelection, deleteRemotePost, type GitContext } from "./lib/github-backend";
+  import { loadManifestRemote, saveRemoteSelection, deleteRemotePost, reviewRemotePublish, confirmRemotePublish, type GitContext, type PublishReview } from "./lib/github-backend";
 
   type Sel = Selection;
 
@@ -61,6 +63,75 @@
   let saveState = $state<"idle" | "saving" | "saved" | "error">("idle");
   let saveTask: Promise<boolean> | null = null;
   let saveError = $state("");
+  let publishOpen = $state(false);
+  let publishLoading = $state(false);
+  let publishBusy = $state(false);
+  let publishReview = $state<PublishReview | null>(null);
+  let publishError = $state("");
+  let publishMessage = $state("");
+  let publishRevision = 0;
+
+  function closePublish() {
+    publishRevision += 1;
+    publishOpen = false;
+    publishReview = null;
+    void tick().then(() => document.querySelector<HTMLButtonElement>("#publish-button")?.focus());
+  }
+
+  function publishGuard(context: GitContext, revision: number, auth: number) {
+    if (!publishOpen || revision !== publishRevision || auth !== authRevision || gitContext !== context) throw new Error("Publish review is no longer active. Reconnect and review again.");
+    requireGitContext();
+    if (dirty || saveTask || saveState === "saving") throw new Error("Save your unsaved edits first, then review publishing. Your edits are still here.");
+  }
+
+  async function reviewPublish() {
+    if (publishBusy || publishLoading) return;
+    publishOpen = true;
+    publishReview = null;
+    publishError = "";
+    publishMessage = "";
+    publishLoading = true;
+    const revision = ++publishRevision, auth = authRevision;
+    try {
+      const context = requireGitContext();
+      const guard = () => publishGuard(context, revision, auth);
+      guard();
+      const review = await reviewRemotePublish(context, manifest, guard);
+      guard();
+      publishReview = review;
+    } catch (error) {
+      handleAuthError(error);
+      if (revision === publishRevision) publishError = error instanceof Error ? error.message : "Could not review saved changes.";
+    } finally { publishLoading = false; }
+  }
+
+  async function publish() {
+    if (publishBusy || publishLoading || !publishReview) return;
+    publishBusy = true;
+    publishError = "";
+    const review = publishReview, revision = publishRevision, auth = authRevision;
+    try {
+      const context = requireGitContext();
+      const guard = () => publishGuard(context, revision, auth);
+      guard();
+      const result = await confirmRemotePublish(context, manifest, review, guard);
+      guard();
+      publishReview = null;
+      if (result === "synced") {
+        const remote = await loadManifestRemote(context, blueprint!, false);
+        guard();
+        manifest = remote;
+        openSelection(sel);
+        publishMessage = "Drafts synced. Nothing was published. Close this dialog and review again before publishing.";
+      } else publishMessage = `Published to ${review.publishBranch}. Your configured deployment can now start; the site is not instantly live. The drafts branch is preserved.`;
+    } catch (error) {
+      handleAuthError(error);
+      if (revision === publishRevision) {
+        publishError = error instanceof Error ? error.message : "Could not verify publishing. Check GitHub before retrying.";
+        if (/changed|no longer matches/.test(publishError)) publishReview = null;
+      }
+    } finally { publishBusy = false; }
+  }
   let pendingNavigation = $state<(() => void) | null>(null);
   let actionDialog = $state<{ title: string; description: string; confirmLabel: string; fieldLabel?: string; danger?: boolean; onconfirm: (value: string) => void | Promise<void> } | null>(null);
   let newEntry = $state<{ collection: string; post: CollectionPost } | null>(null);
@@ -129,6 +200,7 @@
   }
 
   function invalidateSession() {
+    closePublish();
     authRevision += 1;
     clearSession();
     gitContext = null;
@@ -142,7 +214,8 @@
   }
 
   async function connectGitHub() {
-    if (connectionBusy || saveState === "saving" || !manifest.github) return;
+    if (connectionBusy || saveState === "saving" || publishBusy || !manifest.github) return;
+    closePublish();
     connectionBusy = true;
     connectionError = "";
     const revision = ++authRevision;
@@ -173,6 +246,8 @@
   function signOut() {
     if (saveState === "saving" || connectionBusy) return;
     userOpen = false;
+    if (publishBusy) { invalidateSession(); connected = false; return; }
+    closePublish();
     requestNavigation(() => {
       invalidateSession();
       connected = false;
@@ -202,6 +277,7 @@
   });
 
   function save(): Promise<boolean> {
+    if (publishOpen || publishBusy) return Promise.resolve(false);
     if (saveTask) return saveTask;
     saveTask = (async () => {
       if (dirty) {
@@ -215,6 +291,10 @@
         const docSel = sel?.kind === "document" ? sel : null;
         const creatingDoc = docSel !== null && newDocument?.id === docSel.id;
         try {
+          if ((selection?.kind === "post" || (docSel && !activeDocType?.shared)) && Object.hasOwn(values, "slug")) {
+            values.slug = normalizeUrlSlug(values.slug);
+            draft.slug = values.slug;
+          }
           if (githubMode) {
             if (!selection) throw new Error("Select content before saving.");
             await saveRemoteSelection(requireGitContext(), manifest, selection, values, body, !!creating || creatingDoc);
@@ -234,7 +314,7 @@
             newDocument = null;
             docBase = JSON.parse(JSON.stringify(values));
           } else if (m) { m.title = values.title; m.items = values.items; }
-          else if (po) { po.frontmatter = { slug: po.slug, ...values }; po.body = body; bodyBase = body; }
+          else if (po) { po.frontmatter = values; po.body = body; bodyBase = body; }
           else if (p) p.values = values;
           if (creating && po && c) c.posts.push(po);
           newEntry = null;
@@ -411,8 +491,8 @@
     return map;
   });
   function documentPreview(mode: "draft" | "website") {
-    if (sel?.kind !== "document" || newDocument?.id === sel.id) return null;
-    return previewUrl(manifest.preview ?? {}, { kind: "document", type: sel.type, slug: sel.id.slice(sel.type.length + 1) }, mode);
+    if (sel?.kind !== "document" || (mode === "draft" && newDocument?.id === sel.id)) return null;
+    return previewUrl(manifest.preview ?? {}, { kind: "document", type: sel.type, slug: sel.id.slice(sel.type.length + 1), urlSlug: Object.hasOwn(draft, "slug") ? String(draft.slug) : undefined }, mode);
   }
   const standaloneDocument = $derived(sel?.kind === "document" && activeDocType?.shared === true);
   const visualSelection = $derived(sel?.kind === "post" || (sel?.kind === "document" && !standaloneDocument));
@@ -422,13 +502,13 @@
       ...manifest.pages.filter((p) => !p.shared && (pageCategory === undefined || p.category === pageCategory))
         .map((p) => ({ slug: p.slug, title: p.label, category: p.category, draft: false, target: { kind: "page", slug: p.slug } as Sel })),
       ...(pageCategory === undefined ? pageDocuments
-        .map((doc) => ({ slug: doc.slug, title: String(doc.data.title ?? doc.slug), category: undefined, draft: doc.data.draft === true, target: { kind: "document", type: doc.type, id: doc.id } as Sel })) : []),
+        .map((doc) => ({ slug: effectiveSlug(doc.data, doc.slug), title: String(doc.data.title ?? doc.slug), category: undefined, draft: doc.data.draft === true, target: { kind: "document", type: doc.type, id: doc.id } as Sel })) : []),
     ];
     const key = sortBy === "slug" || sortBy === "category" ? sortBy : "title";
     return rows.sort((a, b) => String(a[key] ?? "").localeCompare(String(b[key] ?? "")) * sortDir);
   });
   function documentCell(doc: ContentDocument, key: string): string {
-    return String(key === "title" ? doc.data.title ?? doc.data.name ?? doc.slug : key === "slug" ? doc.slug : doc.data[key] ?? "");
+    return String(key === "title" ? doc.data.title ?? doc.data.name ?? doc.slug : key === "slug" ? activeDocType?.shared ? doc.slug : effectiveSlug(doc.data, doc.slug) : doc.data[key] ?? "");
   }
   const typeDocuments = $derived((manifest.documents ?? []).filter((doc) => doc.type === docTypeName(sel)).sort((a, b) => documentCell(a, sortBy).localeCompare(documentCell(b, sortBy)) * sortDir));
 
@@ -507,6 +587,7 @@
   }
 
   function requestNavigation(action: () => void) {
+    if (publishOpen || publishBusy) return;
     if (dirty || saveState === "saving") pendingNavigation = action;
     else action();
   }
@@ -564,7 +645,6 @@
       const po = post;
       if (!po) return;
       const fm: Record<string, unknown> = { ...po.frontmatter };
-      delete fm.slug;
       draft = JSON.parse(JSON.stringify(fm));
       bodyDraft = po.body;
       bodyBase = po.body;
@@ -590,9 +670,7 @@
     }
     const ref =
       sel?.kind === "menu" && menu ? { title: menu.title, items: menu.items } : sel?.kind === "post" && post
-        ? Object.fromEntries(
-            Object.entries(post.frontmatter).filter(([k]) => k !== "slug"),
-          )
+        ? post.frontmatter
         : page?.values;
     dirty =
       newEntry !== null ||
@@ -602,7 +680,7 @@
   }
 
   function cellValue(p: { slug: string; frontmatter: Record<string, unknown> }, key: string): string {
-    const v = key === "slug" ? p.slug : p.frontmatter[key];
+    const v = key === "slug" ? effectiveSlug(p.frontmatter, p.slug) : p.frontmatter[key];
     const field = coll?.fields.find(field => field.key === key);
     if (field?.type === "reference") return referenceLabel(v, referenceOptions(field, manifest.documents)) || "—";
     if (v === true) return "✓";
@@ -618,7 +696,7 @@
       onconfirm: (title) => {
         const slug = slugify(title);
         if (!slug) throw new Error("Enter a title containing letters or numbers.");
-        const taken = [...(manifest.documents ?? []).filter(doc => !type.shared || doc.type === type.name).map((doc) => doc.slug), ...(!type.shared ? manifest.pages.map((page) => page.slug) : [])];
+        const taken = [...(manifest.documents ?? []).filter(doc => !type.shared || doc.type === type.name).flatMap((doc) => [doc.slug, ...(type.shared || docTypes.find(type => type.name === doc.type)?.shared ? [] : [effectiveSlug(doc.data, doc.slug)])]), ...(!type.shared ? manifest.pages.map((page) => page.slug) : [])];
         if (taken.includes(slug)) throw new Error(`The slug "${slug}" is already used by another document or page.`);
         const id = `${type.name}:${slug}`;
         const data = newDocumentFromTemplate(schema, type.name, title, slug);
@@ -634,15 +712,16 @@
     actionDialog = {
       title: `Add to ${c.label}`, description: "Enter a title to start a draft. Nothing is written until you press Save.", fieldLabel: "Title", confirmLabel: "Create draft",
       onconfirm: (title) => {
-        const slug = slugify(title, c.posts.map((post) => post.slug));
+        const slug = slugify(title, c.posts.flatMap((post) => [post.slug, effectiveSlug(post.frontmatter, post.slug)]));
         if (!slug) throw new Error("Enter a title containing letters or numbers.");
-        newEntry = { collection: c.name, post: { slug, frontmatter: initialCollectionValues(c.fields, title), body: emptyBody() } };
+        newEntry = { collection: c.name, post: { slug, frontmatter: { ...initialCollectionValues(c.fields, title), slug }, body: emptyBody() } };
         openSelection({ kind: "post", collection: c.name, slug });
       },
     };
   }
 
   function deletePost() {
+    if (publishOpen || publishBusy) return;
     const current = post, collection = coll, unsaved = newEntry !== null;
     if (!current || !collection) return;
     actionDialog = {
@@ -689,7 +768,7 @@
   onresize={endPreviewResize}
   onblur={endPreviewResize}
   oncontextmenu={(event) => { if (!settings.devMode) event.preventDefault(); }}
-  onbeforeunload={(event) => { if (dirty || saveState === "saving") { event.preventDefault(); event.returnValue = ""; } }}
+  onbeforeunload={(event) => { if (dirty || saveState === "saving" || publishBusy) { event.preventDefault(); event.returnValue = ""; } }}
   onclick={(e) => {
     if (!(e.target instanceof Element) || !e.target.closest('.user-menu-wrap')) userOpen = false;
   }}
@@ -736,11 +815,10 @@
 </div>
 {:else}
 <div class="rigel" class:sidebar-collapsed={settings.userPref.sidebarCollapsed}>
-  <aside id="rigel-sidebar">
-    <a class="brand" href="/rigel/" role="button" aria-label="Welcome" aria-describedby="rigel-beta" onclick={(event) => { event.preventDefault(); goWelcome(); }}>
+  <aside id="rigel-sidebar" data-tooltip-position="right">
+    <a class="brand" href="/rigel/" role="button" aria-label="Welcome" onclick={(event) => { event.preventDefault(); goWelcome(); }}>
       <img src={logo} alt="" width="32" height="32" />
       <span>Rigel <span class="brand-suffix">CMS</span></span>
-      <span id="rigel-beta" class="badge">Beta</span>
     </a>
     <TopBar {manifest} {sel} onselect={select} />
 
@@ -771,6 +849,11 @@
       {/each}
     </nav>
 
+    {#if githubMode && manifest.github?.publishBranch}
+      <button id="publish-button" class="sidebar-publish" aria-label="Publish" data-tooltip={dirty ? "Save your edits before publishing" : "Publish saved branch changes"} disabled={publishBusy || publishLoading || saveState === "saving" || connectionBusy || tokenExpired || githubAccess?.status !== "ready"} onclick={reviewPublish}>
+        <Icon name="external" size={18} /><span class="sidebar-label">Publish</span>
+      </button>
+    {/if}
     <button class="sidebar-toggle" aria-expanded={!settings.userPref.sidebarCollapsed} aria-controls="rigel-sidebar-navigation" aria-label={settings.userPref.sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"} data-tooltip={settings.userPref.sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"} onclick={() => { settings.userPref.sidebarCollapsed = !settings.userPref.sidebarCollapsed; }}>
       <SidebarIcon name="sidebar-simple" /><span class="sidebar-label">Collapse sidebar</span>
     </button>
@@ -793,11 +876,11 @@
               Live Site
             </a>
             <div class="divider"></div>
-            <button role="menuitem" onclick={() => { userOpen = false; requestNavigation(() => { settingsOpen = true; }); }}>
+            <button role="menuitem" onclick={() => { userOpen = false; settingsOpen = true; }}>
               <Icon name="gear" size={13} />
               Settings
             </button>
-            <button role="menuitem" onclick={() => { userOpen = false; requestNavigation(() => { shortcutsOpen = true; }); }}>
+            <button role="menuitem" onclick={() => { userOpen = false; shortcutsOpen = true; }}>
               <Icon name="keyboard" size={13} />
               Keyboard Shortcuts
             </button>
@@ -951,6 +1034,9 @@
         <MenuEditor items={draft.items as MenuItem[]} maxDepth={manifest.menus.maxDepth} oninput={(items) => { draft.items = items; touch(); }} />
 
       {:else if sel?.kind === "page" && page}
+        {#if !page.shared}
+          <section><label><span>Website route</span><input type="text" value={manifest.preview?.pages?.[page.slug] ?? "Not configured"} readonly /></label><p class="hint">This copy page uses a fixed Astro route. Its URL can only be changed in the website code; slug metadata cannot move it.</p></section>
+        {/if}
         {#each page.groups as group (group.id)}
           <section>
             <h3>{group.label}</h3>
@@ -979,13 +1065,13 @@
             bodyInline={settings.userPref.editorExperience === "inline"}
             onbody={(value) => { bodyDraft = value; touch(); }}
             previewPath={manifest.preview ? previewUrl(manifest.preview, sel, "draft", !!newEntry) : null}
-            websitePath={manifest.preview ? previewUrl(manifest.preview, sel, "website") : null}
+            websitePath={manifest.preview ? previewUrl(manifest.preview, { ...sel, urlSlug: Object.hasOwn(draft, "slug") ? String(draft.slug) : undefined }, "website") : null}
             creating={!!newEntry}
             devMode={settings.devMode}
             onchange={(next) => { draft = next; touch(); }}
           >
-            {#snippet properties(selected, focusToken, bodyInline, oneditbody)}
-              <CollectionPanel fields={coll.fields} values={draft} documents={manifest.documents ?? []} body={bodyDraft as ArticleBody} {bodyInline} {oneditbody} {selected} {focusToken} devMode={settings.devMode} onchange={(key, value) => { draft[key] = value; touch(); }} onbody={(value) => { bodyDraft = value; touch(); }} />
+            {#snippet properties(selected, focusToken, bodyInline, oneditbody, bodyLoading)}
+              <CollectionPanel fields={coll.fields} values={draft} storageSlug={post.slug} documents={manifest.documents ?? []} body={bodyDraft as ArticleBody} {bodyInline} {bodyLoading} {oneditbody} {selected} {focusToken} devMode={settings.devMode} onchange={(key, value) => { draft[key] = value; touch(); }} onbody={(value) => { bodyDraft = value; touch(); }} />
             {/snippet}
           </VisualEditor>
         {/key}
@@ -1025,3 +1111,6 @@
 {#if actionDialog}
   <ActionDialog {...actionDialog} onclose={() => { actionDialog = null; }} />
 {/if}
+{#if publishOpen}
+  <PublishDialog review={publishReview} loading={publishLoading} busy={publishBusy} error={publishError} message={publishMessage} onrefresh={reviewPublish} onconfirm={publish} onclose={closePublish} />
+{/if}

package/src/editor/blocks/embed.ts

@@ -0,0 +1,21 @@
+import { DecoratorNode, type NodeKey } from "lexical";
+import type { EmbedProvider } from "../lib/embeds";
+import { createEmbedPreview } from "../lib/embed-preview";
+
+export type EmbedData = { provider: EmbedProvider; id: string; title?: string; privacy: boolean };
+export class EmbedNode extends DecoratorNode<null> {
+  __embed: EmbedData;
+  static getType() { return "embed"; }
+  static clone(node: EmbedNode) { return new EmbedNode(node.__embed, node.__key); }
+  constructor(embed: EmbedData = { provider: "youtube", id: "", privacy: true }, key?: NodeKey) { super(key); this.__embed = embed; }
+  static importJSON(raw: unknown) { const embed = raw as EmbedData; return new EmbedNode({ provider: embed.provider, id: embed.id, title: embed.title, privacy: embed.privacy !== false }); }
+  exportJSON() { return { ...this.__embed, type: "embed", version: 1 }; }
+  createDOM() {
+    return createEmbedPreview(this.__embed, document, true);
+  }
+  updateDOM() { return true; }
+  decorate() { return null; }
+  isInline() { return false; }
+  getTextContent() { return this.__embed.title ?? ""; }
+}
+export const create = (embed?: EmbedData) => new EmbedNode(embed);

package/src/editor/blocks/index.ts

@@ -7,6 +7,8 @@ import { LinkNode } from "@lexical/link";
 import { CodeNode } from "@lexical/code";
 import { TableNode, TableRowNode, TableCellNode } from "@lexical/table";
 import { ImageNode, create as image } from "./image";
+import { VideoNode } from "./video";
+import { EmbedNode } from "./embed";
 import { DividerNode, create as divider } from "./divider";
 import { create as quote } from "./quote";
 import { create as bullet } from "./bulleted-list";
@@ -37,4 +39,4 @@ export const blockTypes: { value: string; label: string; icon: keyof typeof ICON
   { value: "divider", label: "Divider", icon: "minus", create: divider },
   { value: "table", label: "Table", icon: "table", create: table },
 ];
-export const blockNodes = [HeadingNode, QuoteNode, ListNode, ListItemNode, LinkNode, CodeNode, ImageNode, DividerNode, TableNode, TableRowNode, TableCellNode];
+export const blockNodes = [HeadingNode, QuoteNode, ListNode, ListItemNode, LinkNode, CodeNode, ImageNode, VideoNode, EmbedNode, DividerNode, TableNode, TableRowNode, TableCellNode];

package/src/editor/blocks/video.ts

@@ -0,0 +1,35 @@
+import { DecoratorNode, type NodeKey } from "lexical";
+import { safePreviewUrl } from "../../preview-urls";
+import { createVideoOverlay } from "../lib/embed-preview";
+
+export type VideoData = { src: string; poster?: string; caption?: string; muted?: boolean; controls?: boolean };
+export class VideoNode extends DecoratorNode<null> {
+  __video: VideoData;
+  static getType() { return "video"; }
+  static clone(node: VideoNode) { return new VideoNode(node.__video, node.__key); }
+  constructor(video: VideoData = { src: "" }, key?: NodeKey) { super(key); this.__video = video; }
+  static importJSON(raw: unknown) { const video = raw as VideoData; return new VideoNode({ src: video.src, poster: video.poster, caption: video.caption, muted: video.muted, controls: video.controls }); }
+  exportJSON() { return { ...this.__video, type: "video", version: 1 }; }
+  createDOM() {
+    const figure = document.createElement("figure");
+    figure.className = "media-video";
+    const video = document.createElement("video");
+    if (safePreviewUrl(this.__video.src, true)) video.src = this.__video.src;
+    if (this.__video.poster && safePreviewUrl(this.__video.poster, true)) video.poster = this.__video.poster;
+    video.controls = this.__video.controls !== false;
+    video.muted = video.defaultMuted = this.__video.muted === true;
+    video.preload = "metadata";
+    video.playsInline = true;
+    const preview = document.createElement("div");
+    preview.style.cssText = "position:relative;min-height:220px";
+    preview.append(video, createVideoOverlay(document, "Video", this.__video.src, true));
+    figure.append(preview);
+    if (this.__video.caption) { const caption = document.createElement("figcaption"); caption.textContent = this.__video.caption; figure.append(caption); }
+    return figure;
+  }
+  updateDOM() { return true; }
+  decorate() { return null; }
+  isInline() { return false; }
+  getTextContent() { return this.__video.caption ?? ""; }
+}
+export const create = (video?: VideoData) => new VideoNode(video);

package/src/editor/lib/ActionDialog.svelte

@@ -25,7 +25,7 @@
   }
 </script>
 
-<dialog bind:this={dialog} class="rigel rigel-modal-backdrop action-dialog" aria-labelledby="action-title" aria-describedby="action-description" oncancel={(event) => { event.preventDefault(); if (!busy) onclose(); }}>
+<dialog bind:this={dialog} class="rigel rigel-modal-backdrop action-dialog" aria-labelledby="action-title" aria-describedby="action-description" oncancel={(event) => { event.preventDefault(); event.stopPropagation(); if (!busy) onclose(); }} onkeydown={(event) => { if (event.key === "Escape") { event.preventDefault(); event.stopPropagation(); if (!busy) onclose(); } }}>
   <form class="rigel-modal" onsubmit={(event) => { event.preventDefault(); void submit(); }}>
     <div class="action-head"><h2 id="action-title">{title}</h2><button type="button" class="icon-btn" aria-label="Cancel" disabled={busy} onclick={onclose}><Icon name="x" size={16} /></button></div>
     <p id="action-description">{description}</p>
@@ -45,6 +45,7 @@
   .action-dialog::backdrop { background: transparent; }
   .action-head, .action-actions { display: flex; align-items: center; gap: 0.75rem; }
   .action-head { justify-content: space-between; }
+  .action-head h2 { min-width: 0; overflow-wrap: anywhere; }
   .action-actions { justify-content: flex-end; flex-wrap: wrap; margin-top: 1.5rem; }
   .action-actions button[type=button] { padding: 0.4375rem 0.75rem; border: 1px solid var(--border-control); border-radius: 0; background: var(--panel); color: var(--text); font: inherit; font-size: 0.8125rem; cursor: pointer; }
   button:disabled { opacity: 0.5; cursor: wait; }