@rigel-cms/rigel 0.1.3-beta.1 → 0.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rigel-cms/rigel",
-  "version": "0.1.3-beta.1",
+  "version": "0.2.0-beta.1",
   "publishConfig": {
     "access": "public",
     "tag": "beta"

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,4 +1,7 @@
 <script lang="ts">
+  import { onMount, tick } from "svelte";
+  import { tooltipRoot } from "./lib/tooltip";
+  onMount(() => tooltipRoot(document.body).destroy);
   import type {
     Manifest,
     ManifestCollection,
@@ -17,22 +20,24 @@
   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";
   import { getSettings, setSettings } from "./lib/settings";
-  import { eraseData } from "./lib/storage";
+  import { eraseData, readSession, writeSession, clearSession } from "./lib/storage";
   import MenuEditor from "./lib/MenuEditor.svelte";
   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;
 
@@ -40,6 +45,7 @@
   let ready = $state(false);
   let blueprint: Manifest | null = null;
   let gitContext: GitContext | null = null;
+  let authRevision = 0;
   let connected = $state(false);
   let connectionBusy = $state(false);
   let connectionError = $state("");
@@ -57,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);
@@ -76,6 +151,14 @@
       blueprint = data;
       manifest = data;
       ready = true;
+      if (data.backend === "github" && data.github) {
+        const session = readSession(data.github);
+        if (session) {
+          gitContext = { token: session.accessToken, repo: data.github.repo, branch: data.github.branch };
+          sessionExpiresAt = session.expiresAt;
+          await recheckGitHub();
+        }
+      }
     } catch (error) {
       loadError = error instanceof Error ? error.message : "Could not load the editor configuration.";
     }
@@ -85,7 +168,7 @@
     if (connectionBusy) throw new Error("Wait for GitHub access verification before saving.");
     if (!gitContext || !connected || githubAccess?.status !== "ready") throw new Error("Connect GitHub and verify repository access before saving.");
     if (Date.now() >= sessionExpiresAt - 30_000) {
-      tokenExpired = true;
+      invalidateSession();
       throw new Error("Your GitHub session expired. Reconnect GitHub, then retry. Your unsaved edits are still here.");
     }
     return gitContext;
@@ -93,27 +176,56 @@
 
   async function verifyGitHub() {
     const config = blueprint?.github;
-    if (!config || !gitContext) return;
-    if (Date.now() >= sessionExpiresAt - 30_000) throw new Error("Your GitHub session expired. Sign in again to check repository access.");
-    githubAccess = await checkGitHubAccess(gitContext.token, config.repo, config.appSlug);
-    if (githubAccess.status !== "ready") return;
-    if (!connected && blueprint) {
-      const remote = await loadManifestRemote(gitContext, blueprint);
-      manifest = remote;
-      connected = true;
+    const context = gitContext;
+    if (!config || !context) return;
+    try {
+      if (Date.now() >= sessionExpiresAt - 30_000) {
+        invalidateSession();
+        throw new Error("Your GitHub session expired. Sign in again to check repository access.");
+      }
+      const access = await checkGitHubAccess(context.token, config.repo, config.appSlug);
+      if (gitContext !== context) return;
+      githubAccess = access;
+      if (access.status !== "ready") return;
+      if (!connected && blueprint) {
+        const remote = await loadManifestRemote(context, blueprint);
+        if (gitContext !== context) return;
+        manifest = remote;
+        connected = true;
+      }
+    } catch (error) {
+      if (gitContext === context) handleAuthError(error);
+      throw error;
     }
   }
 
+  function invalidateSession() {
+    closePublish();
+    authRevision += 1;
+    clearSession();
+    gitContext = null;
+    sessionExpiresAt = 0;
+    githubAccess = null;
+    tokenExpired = true;
+  }
+
+  function handleAuthError(error: unknown) {
+    if (error instanceof Error && "status" in error && error.status === 401) invalidateSession();
+  }
+
   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;
     try {
       const session = await startGitHubLogin(manifest.github.authOrigin);
-      if (gitContext) gitContext.token = session.accessToken;
-      else gitContext = { token: session.accessToken, repo: manifest.github.repo, branch: manifest.github.branch };
+      if (revision !== authRevision) return;
+      gitContext = { token: session.accessToken, repo: manifest.github.repo, branch: manifest.github.branch };
       githubAccess = null;
       sessionExpiresAt = session.expiresAt;
+      writeSession(manifest.github, session);
       await verifyGitHub();
     } catch (error) {
       connectionError = error instanceof Error ? error.message : "Could not connect GitHub. Try signing in again.";
@@ -134,10 +246,10 @@
   function signOut() {
     if (saveState === "saving" || connectionBusy) return;
     userOpen = false;
+    if (publishBusy) { invalidateSession(); connected = false; return; }
+    closePublish();
     requestNavigation(() => {
-      gitContext = null;
-      sessionExpiresAt = 0;
-      githubAccess = null;
+      invalidateSession();
       connected = false;
       connectionError = "";
       settingsOpen = false;
@@ -158,13 +270,14 @@
 
   $effect(() => {
     const expiry = sessionExpiresAt;
-    tokenExpired = !!expiry && Date.now() >= expiry - 30_000;
+    tokenExpired = !expiry || Date.now() >= expiry - 30_000;
     if (!expiry) return;
-    const timer = setTimeout(() => { tokenExpired = true; }, Math.max(0, expiry - Date.now() - 30_000));
+    const timer = setTimeout(invalidateSession, Math.max(0, expiry - Date.now() - 30_000));
     return () => clearTimeout(timer);
   });
 
   function save(): Promise<boolean> {
+    if (publishOpen || publishBusy) return Promise.resolve(false);
     if (saveTask) return saveTask;
     saveTask = (async () => {
       if (dirty) {
@@ -178,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);
@@ -186,7 +303,7 @@
             ? `/rigel/api/local/documents/${encodeURIComponent(docSel.id)}`
             : m ? `/rigel/api/local/menus/${m.slug}` : po && c ? `/rigel/api/local/${c.name}/${encodeURIComponent(po.slug)}` : "/rigel/api/local/save";
           const payload = docSel ? { data: values } : m ? { slug: m.slug, title: values.title, items: values.items } : po ? { frontmatter: values, body } : { slug: p?.slug, values };
-          const res = await fetch(url, { method: docSel ? (creatingDoc ? "POST" : "PUT") : m ? "PUT" : "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(payload) });
+          const res = await fetch(url, { method: docSel ? (creatingDoc ? "POST" : "PUT") : m ? "PUT" : "POST", headers: { "Content-Type": "application/json", ...(po && creating ? { "If-None-Match": "*" } : {}) }, body: JSON.stringify(payload) });
           if (!res.ok) throw new Error((await res.text()) || `Save failed (${res.status})`);
           }
           if (docSel) {
@@ -197,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;
@@ -205,6 +322,7 @@
           saveState = dirty ? "idle" : "saved";
           saveError = "";
         } catch (error) {
+          handleAuthError(error);
           saveState = "error";
           saveError = error instanceof Error ? error.message : "Could not save changes";
           return false;
@@ -220,10 +338,10 @@
 
   let settings = $state(getSettings());
   let settingsError = $state("");
-  const userName = $derived(githubMode ? githubAccess?.user.login ?? "GitHub user" : "Local user");
+  const userName = $derived(githubMode ? githubAccess?.user.name ?? githubAccess?.user.login ?? "GitHub user" : "Local user");
   const userAvatar = $derived(githubMode && /^https:\/\/avatars\.githubusercontent\.com\//.test(githubAccess?.user.avatar_url ?? "") ? githubAccess!.user.avatar_url : "");
   let failedAvatar = $state("");
-  const userMode = $derived(githubMode ? `${manifest.github?.repo} · ${manifest.github?.branch}` : "Local mode");
+  const userLogin = $derived(githubMode && githubAccess ? `@${githubAccess.user.login}` : "Local mode");
   let content: HTMLDivElement;
   let contentWidth = $state(0);
   let resizing = $state(false);
@@ -273,7 +391,7 @@
   function eraseBrowserData() {
     actionDialog = {
       title: "Erase browser data?", confirmLabel: "Erase data", danger: true,
-      description: "This removes Rigel settings, API keys and unsaved drafts from this browser. Saved repository files will not change. The editor will reload.",
+      description: "This removes Rigel settings, API keys, GitHub login and unsaved drafts from this browser. Saved repository files will not change. The editor will reload.",
       onconfirm: () => {
         if (saveState === "saving") throw new Error("Wait for the current save to finish.");
         eraseData();
@@ -372,9 +490,9 @@
     if (current?.kind === "document") map[current.id] = draft;
     return map;
   });
-  function documentPreview(mode: "live" | "draft") {
-    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);
+  function documentPreview(mode: "draft" | "website") {
+    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));
@@ -384,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));
 
@@ -469,6 +587,7 @@
   }
 
   function requestNavigation(action: () => void) {
+    if (publishOpen || publishBusy) return;
     if (dirty || saveState === "saving") pendingNavigation = action;
     else action();
   }
@@ -526,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;
@@ -552,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 ||
@@ -564,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 "✓";
@@ -580,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);
@@ -596,16 +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);
+        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.");
-        if (c.posts.some((p) => p.slug === slug)) throw new Error(`A post with slug "${slug}" already exists.`);
-        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 = {
@@ -613,7 +729,10 @@
       description: unsaved ? "This discards the new post and its unsaved changes." : `This deletes ${current.slug}.json${githubMode ? ` from ${manifest.github?.branch}` : ""} and discards any unsaved changes. This cannot be undone in the editor.`,
       onconfirm: async () => {
         if (!unsaved) {
-          if (githubMode) await deleteRemotePost(requireGitContext(), manifest, collection.name, current.slug);
+          if (githubMode) {
+            try { await deleteRemotePost(requireGitContext(), manifest, collection.name, current.slug); }
+            catch (error) { handleAuthError(error); throw error; }
+          }
           else {
           const res = await fetch(`/rigel/api/local/${collection.name}/${encodeURIComponent(current.slug)}`, { method: "DELETE" });
           if (!res.ok) throw new Error((await res.text()) || `Delete failed (${res.status})`);
@@ -640,10 +759,16 @@
 {/snippet}
 
 <svelte:window
+  onstorage={(event) => {
+    if ((event.key === "rigelcms.session" || event.key === null) && blueprint?.github && !readSession(blueprint.github)) {
+      invalidateSession();
+      connectionError = "Signed out in another tab. Reconnect GitHub to save. Your unsaved edits are still here.";
+    }
+  }}
   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;
   }}
@@ -658,8 +783,8 @@
 {#if !ready || (githubMode && !connected)}
 <div class="rigel connection-shell">
   <main id="github-connection" class="connection-card" aria-busy={connectionBusy}>
-    <img src={logo} alt="" width="64" height="64" />
-    <h1>{!ready ? "RigelCMS" : "Connect GitHub"}</h1>
+    <div class="connection-brand"><img src={logo} alt="" width="64" height="64" /><span>Rigel <span class="brand-suffix">CMS</span></span></div>
+    <h1>{!ready ? "Loading editor" : "Connect GitHub"}</h1>
     {#if !ready}
       {#if loadError}<p class="connection-error" role="alert">{loadError}</p><button class="primary" onclick={loadBlueprint}>Retry loading</button>
       {:else}<p role="status">Loading the editor configuration…</p>{/if}
@@ -693,7 +818,7 @@
   <aside id="rigel-sidebar">
     <a class="brand" href="/rigel/" role="button" aria-label="Welcome" aria-describedby="rigel-beta" onclick={(event) => { event.preventDefault(); goWelcome(); }}>
       <img src={logo} alt="" width="32" height="32" />
-      <span>RigelCMS</span>
+      <span>Rigel <span class="brand-suffix">CMS</span></span>
       <span id="rigel-beta" class="badge">Beta</span>
     </a>
     <TopBar {manifest} {sel} onselect={select} />
@@ -714,7 +839,7 @@
             data-document={node.target.kind === "document" ? node.target.id : undefined}
             data-page={node.target.kind === "page" ? node.target.slug : undefined}
             aria-label={node.label}
-            title={node.label}
+            data-tooltip={node.label}
             class:active={navActive(node.target)}
             aria-current={navActive(node.target) ? "page" : undefined}
             onclick={() => select(node.target)}
@@ -725,21 +850,26 @@
       {/each}
     </nav>
 
-    <button class="sidebar-toggle" aria-expanded={!settings.userPref.sidebarCollapsed} aria-controls="rigel-sidebar-navigation" aria-label={settings.userPref.sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"} title={settings.userPref.sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"} onclick={() => { settings.userPref.sidebarCollapsed = !settings.userPref.sidebarCollapsed; }}>
+    {#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>
     <div class="aside-foot">
       <div class="user-menu-wrap">
-        <button class="user-btn" aria-label={githubMode ? "GitHub user menu" : "Local user menu"} title={githubMode ? "GitHub user menu" : "Local user menu"} aria-haspopup="menu" aria-expanded={userOpen} onclick={() => (userOpen = !userOpen)}>
+        <button class="user-btn" aria-label={githubMode ? "GitHub user menu" : "Local user menu"} data-tooltip={githubMode ? "GitHub user menu" : "Local user menu"} aria-haspopup="menu" aria-expanded={userOpen} onclick={() => (userOpen = !userOpen)}>
           {@render avatar()}
-          <span class="user-details"><span class="uname">{userName}</span><small>{userMode}</small></span>
+          <span class="user-details"><span class="uname">{userName}</span><small>{userLogin}</small></span>
           <span class="user-menu-icon"><Icon name="dotsThreeOutlineVertical" size={18} /></span>
         </button>
         {#if userOpen}
           <div class="user-menu" role="menu">
             <div class="user-menu-head">
               {@render avatar()}
-              <div class="user-details"><strong>{userName}</strong><small>{userMode}</small></div>
+              <div class="user-details"><strong>{userName}</strong><small>{userLogin}</small></div>
             </div>
             <div class="divider"></div>
             <a role="menuitem" href="/" target="_blank" rel="noopener">
@@ -760,7 +890,7 @@
             <a role="menuitem" href={githubAccess?.installUrl} target="_blank" rel="noopener noreferrer">Configure GitHub access</a>
             <button role="menuitem" class="github-reconnect" disabled={connectionBusy || saveState === "saving"} onclick={() => { userOpen = false; void connectGitHub(); }}>Reconnect GitHub</button>
             {/if}
-            <button id={githubMode ? "github-sign-out" : undefined} role="menuitem" class:muted={!githubMode} disabled={!githubMode || saveState === "saving" || connectionBusy} title={githubMode ? "Sign out of this editor" : "Local mode"} onclick={signOut}>
+            <button id={githubMode ? "github-sign-out" : undefined} role="menuitem" class:muted={!githubMode} disabled={!githubMode || saveState === "saving" || connectionBusy} data-tooltip={githubMode ? "Sign out of this editor" : "Local mode"} onclick={signOut}>
               <Icon name="signOut" size={13} />
               Sign Out
               {#if !githubMode}<span class="soon">backend: github</span>{/if}
@@ -807,7 +937,7 @@
           <button class="primary" onclick={() => (sel?.kind === "collection" ? newPost(coll!) : newPage(sel?.kind === "documents" ? activeDocType : pageDocType))}>Add new</button>
         {/if}
         {#if sel?.kind === "post" && post}
-          <button class="icon-btn" title="Delete post" disabled={saveState === "saving"} onclick={deletePost}>
+          <button class="icon-btn" aria-label="Delete post" data-tooltip="Delete post" disabled={saveState === "saving"} onclick={deletePost}>
             <Icon name="trash" size={15} />
           </button>
         {/if}
@@ -885,7 +1015,7 @@
           values={draft}
           documents={draftDocuments}
           previewPath={documentPreview("draft")}
-          livePath={documentPreview("live")}
+          websitePath={documentPreview("website")}
           creating={newDocument?.id === sel.id}
           devMode={settings.devMode}
           reloadToken={documentReload}
@@ -905,6 +1035,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>
@@ -933,13 +1066,13 @@
             bodyInline={settings.userPref.editorExperience === "inline"}
             onbody={(value) => { bodyDraft = value; touch(); }}
             previewPath={manifest.preview ? previewUrl(manifest.preview, sel, "draft", !!newEntry) : null}
-            livePath={manifest.preview ? previewUrl(manifest.preview, sel, "live") : 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(); }} />
+              <CollectionPanel fields={coll.fields} values={draft} storageSlug={post.slug} 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}
           </VisualEditor>
         {/key}
@@ -947,7 +1080,7 @@
       {:else}
         <div class="welcome">
           <img src={logo} alt="" width="64" height="64" />
-          <h2>Welcome to RigelCMS</h2>
+          <h2>Welcome to Rigel CMS</h2>
           <p>The best CMS in the whole space.</p>
           <p class="welcome-hint">Select a page or collection from the sidebar to start editing.</p>
         </div>
@@ -968,7 +1101,7 @@
 {/if}
 
 {#if settingsOpen}
-  <Settings bind:s={settings} error={settingsError} saving={saveState === "saving"} onerase={eraseBrowserData} onclose={() => (settingsOpen = false)} />
+  <Settings bind:s={settings} github={githubMode ? manifest.github : undefined} user={githubAccess?.user} error={settingsError} saving={saveState === "saving"} onerase={eraseBrowserData} onclose={() => (settingsOpen = false)} />
 {/if}
 {#if shortcutsOpen}
   <Shortcuts onclose={() => (shortcutsOpen = false)} />
@@ -979,3 +1112,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}