@rigel-cms/rigel 1.3.0 → 1.4.0-rc.2

package/docs/content-locales.md

@@ -4,6 +4,7 @@ Content languages are optional. Configure them separately from `languages`, whic
 
 ```js
 rigel({
+  search: { scope: "all" },
   contentLocales: {
     defaultLocale: "en",
     locales: [
@@ -44,10 +45,26 @@ defineDocument({
 
 Each type can have different fields, allowed sections and initial content. You can also annotate an existing `defineCopy` page with `locale`. Rigel reads the annotation, not the folder name.
 
-With multiple configured locales, the editor shows a Content language dropdown. It filters navigation, page lists, collections and search. Switching away from unsaved changes offers the existing Save, Discard and Keep editing choices. New sessions start with `defaultLocale`.
+With multiple configured locales, the editor shows a Content language dropdown. It filters navigation, page lists and collections. Switching away from unsaved changes offers the existing Save, Discard and Keep editing choices. New sessions start with `defaultLocale`.
+
+## Global search
+
+Sidebar search (⌘/Ctrl + K) searches **all content languages** by default. Set `search: { scope: "currentLocale" }` in your Astro integration to default to the selected content language plus shared resources instead. Missing or invalid scope values fall back to `"all"`. This setting does not change the Pages table's language filter or its live search.
+
+In **Settings → Content → Search content languages**, editors can choose **Website default**, **All languages**, or **Current content language**, alongside the article editing preferences. The override applies immediately and persists in `rigelcms.settings.userPref.searchScope` in this browser. Website default removes the override; Erase All Data resets it with the other browser preferences. It is independent of the editor interface language, which lives in **Settings → Interface** after Theme and Accessibility. Current content language is disabled when there are fewer than two configured content languages.
+
+Results include legacy pages, native documents, collections, posts and menus. Shared resources appear once. Localized results show two-character language codes when multiple content languages exist, with the full configured label available on hover and to screen readers. Opening another language's result switches content language and opens that exact resource through the existing unsaved-changes guard; Keep editing leaves the language and draft untouched. Search still shows at most 12 results.
 
 Content without a `locale` remains visible in every language. Use this for common authors, media and other shared records. A shared document type can also have a locale when its records are language-specific. The language filter is an editing convenience, not an access-control boundary: the manifest and publishing batch still contain the site's complete content.
 
 Without `contentLocales`, the editor keeps its existing navigation and shows no content-language dropdown. A single configured locale also needs no dropdown.
 
 Your Astro routes and templates still own website localization, including public language links, HTML `lang`, translated navigation and fallback behavior. Rigel does not translate text, pair translated entries or generate localized routes. Keep each type's URL mapping consistent with the website routes, and prepare its preview bindings as usual.
+
+## Page categories and templates
+
+Set `category` on a nonshared document definition to group its pages, for example `category: "Articles"`. This is schema metadata, not an editable field in stored documents. Uncategorised native documents and legacy copy pages remain in **Core** without a migration. Pages initially shows **All pages**. When categories exist, the table offers Core, All pages and each category visible in the selected content language. The live search matches title/name, slug and category substrings, ignores case and surrounding whitespace, and combines with the selected category. Its clear button restores input focus. Back preserves both the query and originating table/filter, not a filter inferred from the opened page. Content-language switches retain the query and reset unavailable categories to All pages.
+
+Add new asks for a page name and a category from the locale-eligible, creatable document types. When a category contains multiple types, the editor also requires a Template choice using each definition's title. Shared, singleton and `creatable: false` types are not creation choices. A single uncategorised type keeps the name-only dialog. Creation uses the selected type's identity, initial values and section template; nothing is written until Save.
+
+A visual variant can be another document definition with its own category, defaults and template—for example a Resources category with a dark-theme initial value. Its native type, folder, preview mapping and host renderer must be configured normally. A category does not change the editor theme, rewrite existing document types or generate website routes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rigel-cms/rigel",
-  "version": "1.3.0",
+  "version": "1.4.0-rc.2",
   "description": "A CMS for Astro sites. You edit the text, Git keeps the history.",
   "keywords": [
     "astro",

package/src/config.ts

@@ -9,12 +9,15 @@ import { DEFAULT_MAX_FILE_SIZE } from "./media-types";
 import { systemMessage } from "./editor/i18n/format";
 import { localeNames, type Locale } from "./editor/i18n/locales";
 import { validateContentLocales, validateContentLocale } from "./manifest/content-locales";
+import { effectiveSearchScope } from "./manifest/search";
 
 export interface ContentLocalesConfig {
   defaultLocale: string;
   locales: { code: string; label: string }[];
 }
 
+export type SearchScope = "all" | "currentLocale";
+
 export interface RigelConfig {
   copyDir: string;
   mediaDir?: string;
@@ -25,6 +28,7 @@ export interface RigelConfig {
   demo?: boolean;
   languages?: Locale[];
   contentLocales?: ContentLocalesConfig;
+  search?: { scope: SearchScope };
   extensions?: string[];
   collections?: CollectionConfig[];
   menus?: { folder: string; maxDepth?: number };
@@ -56,6 +60,7 @@ const DEFAULTS: Pick<RigelConfig, "copyDir" | "backend"> = {
 
 export function parseConfig(options: Partial<RigelConfig> = {}): RigelConfig {
   const cfg = { ...DEFAULTS, ...options };
+  cfg.search = { scope: effectiveSearchScope(cfg.search, undefined) };
   if (cfg.contentLocales !== undefined) {
     validateContentLocales(cfg.contentLocales);
     cfg.contentLocales = { ...cfg.contentLocales, locales: cfg.contentLocales.locales.map(locale => ({ ...locale })) };

package/src/editor/App.svelte

@@ -12,9 +12,11 @@
   import SitePreview from "./lib/SitePreview.svelte";
   import ImagePicker from "./lib/ImagePicker.svelte";
   import Settings from "./lib/Settings.svelte";
+  import { effectiveSearchScope } from "../manifest/search";
   import TopBar from "./lib/TopBar.svelte";
   import Select from "./lib/Select.svelte";
   import { contentForLocale, selectionInContent } from "../manifest/content-locales";
+  import { pageCategories, pageTemplates, inPageCategory } from "../manifest/pages";
   import { validateDocumentSlugs } from "../slugs";
   import Shortcuts from "./lib/Shortcuts.svelte";
   import CollectionPanel from "./lib/CollectionPanel.svelte";
@@ -38,7 +40,7 @@
   import VisualEditor from "./lib/VisualEditor.svelte";
   import { newDocumentFromTemplate } from "../schema/paths";
   import { previewUrl, previewPath } from "../preview";
-  import type { ContentDocument, Schema } from "../schema/types";
+  import type { ContentDocument, DocumentDef, 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, reviewRemotePublish, confirmRemotePublish, PublishReviewChangedError, type GitContext, type PublishReview } from "./lib/github-backend";
@@ -142,7 +144,7 @@
   }
   let pendingNavigation = $state<(() => void) | null>(null);
   let pendingNavigationCancel: (() => 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 actionDialog = $state<{ title: string; description: string; confirmLabel: string; fieldLabel?: string; danger?: boolean; templates?: DocumentDef[]; templateCategory?: string; onconfirm: (value: string, type?: string) => void | Promise<void> } | null>(null);
   let newEntry = $state<{ collection: string; post: CollectionPost } | null>(null);
   let newDocument = $state<{ type: string; id: string; slug: string } | null>(null);
   let docBase = $state<Record<string, unknown> | null>(null);
@@ -159,6 +161,7 @@
       if (!Array.isArray(data.pages) || (data.backend === "github" && !data.github)) throw new Error($t("shell.configurationIncomplete"));
       blueprint = data;
       manifest = data;
+      pagesFilter = null;
       ready = true;
       if (data.backend === "github" && data.github) {
         const session = readSession(data.github);
@@ -478,11 +481,20 @@
   });
 
   const sidebar = $derived(buildSidebar(visibleContent, $t));
-  const pageCategory = $derived(sel?.kind === "pages" ? sel.category : undefined);
+  let pagesFilter = $state<string | null>(null);
+  let pagesQuery = $state("");
+  let pagesSearch: HTMLInputElement;
+  let entryList = $state<Sel | null>(null);
+  const categories = $derived(pageCategories(visibleContent));
+  const pageCategory = $derived(sel?.kind === "pages" && sel.category !== undefined ? sel.category : pagesFilter);
   const schema = $derived<Schema | undefined>(manifest.schema);
   const docTypes = $derived(visibleContent.schema?.documents ?? []);
 
   const pageDocType = $derived(docTypes.find((type) => !type.shared && !type.singleton));
+  const templates = $derived(pageTemplates(visibleContent));
+  const pageBack = $derived<Extract<Sel, { kind: "pages" }>>(entryList?.kind === "pages" ? entryList : { kind: "pages" });
+  const documentBack = $derived<Sel | null>(entryList?.kind === "documents" && entryList.type === activeDocType?.name ? entryList : !activeDocType?.shared ? pageBack : activeDocType.singleton ? null : { kind: "documents", type: activeDocType.name });
+  const pageBackLabel = $derived((pageBack.category ?? pagesFilter) || (pagesFilter === "" && categories.length ? $t("shell.coreCategory") : $t("shell.pages")));
   const pageDocuments = $derived((visibleContent.documents ?? []).filter((doc) => docTypes.some(type => type.name === doc.type && !type.shared)));
   function docTypeName(s: Sel | null): string | null {
     return s && (s.kind === "document" || s.kind === "documents") ? s.type : null;
@@ -509,14 +521,15 @@
 
   const sortedPages = $derived.by(() => {
     const rows = [
-      ...visibleContent.pages.filter((p) => !p.shared && (pageCategory === undefined || p.category === pageCategory))
+      ...visibleContent.pages.filter((p) => !p.shared && inPageCategory(p.category, pageCategory))
         .map((p) => ({ slug: p.slug, path: previewPath(manifest.preview ?? {}, { kind: "page", slug: p.slug }), title: p.label, category: p.category, draft: false, target: { kind: "page", slug: p.slug } as Sel })),
       ...pageDocuments
-        .map((doc) => ({ slug: effectiveSlug(doc.data, doc.slug), path: previewPath(manifest.preview ?? {}, { kind: "document", type: doc.type, slug: effectiveSlug(doc.data, doc.slug) }), title: String(doc.data.title ?? doc.slug), category: docTypes.find(type => type.name === doc.type)?.category, draft: doc.data.draft === true, target: { kind: "document", type: doc.type, id: doc.id } as Sel }))
-        .filter(doc => pageCategory === undefined || doc.category === pageCategory),
+        .map((doc) => ({ slug: effectiveSlug(doc.data, doc.slug), path: previewPath(manifest.preview ?? {}, { kind: "document", type: doc.type, slug: effectiveSlug(doc.data, doc.slug) }), title: String(doc.data.title ?? doc.data.name ?? doc.slug), category: docTypes.find(type => type.name === doc.type)?.category, draft: doc.data.draft === true, target: { kind: "document", type: doc.type, id: doc.id } as Sel }))
+        .filter(doc => inPageCategory(doc.category, pageCategory)),
     ];
     const key = sortBy === "slug" || sortBy === "category" || sortBy === "path" ? sortBy : "title";
-    return rows.sort((a, b) => String(a[key] ?? "").localeCompare(String(b[key] ?? "")) * sortDir);
+    const query = pagesQuery.trim().toLocaleLowerCase();
+    return rows.filter(row => !query || [row.title, row.slug, row.category ?? (categories.length ? $t("shell.coreCategory") : "")].some(value => value.toLocaleLowerCase().includes(query))).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" ? activeDocType?.shared ? doc.slug : effectiveSlug(doc.data, doc.slug) : doc.data[key] ?? "");
@@ -526,13 +539,13 @@
 
   const menu = $derived.by(() => { const slug = sel?.kind === "menu" ? sel.slug : null; return manifest.menus?.entries.find((m) => m.slug === slug); });
   const sortedMenus = $derived([...(manifest.menus?.entries ?? [])].sort((a, b) => (sortBy === "slug" ? a.slug.localeCompare(b.slug) : a.title.localeCompare(b.title)) * sortDir));
-  const listTitle = $derived(sel?.kind === "menus" ? $t("shell.allMenus") : sel?.kind === "documents" ? activeDocType?.title ?? $t("shell.documents") : sel?.kind === "pages" ? pageCategory !== undefined ? $t("shell.allNamedEntries", { name: pageCategory }) : $t("shell.allPages") : coll?.listTitle?.trim() || (coll?.label !== undefined ? $t("shell.allNamedEntries", { name: coll.label }) : $t("shell.allEntries")));
+  const listTitle = $derived(sel?.kind === "menus" ? $t("shell.allMenus") : sel?.kind === "documents" ? activeDocType?.title ?? $t("shell.documents") : sel?.kind === "pages" ? pageCategory !== null && categories.length ? $t("shell.allNamedEntries", { name: pageCategory || $t("shell.coreCategory") }) : $t("shell.allPages") : coll?.listTitle?.trim() || (coll?.label !== undefined ? $t("shell.allNamedEntries", { name: coll.label }) : $t("shell.allEntries")));
   const listRows = $derived(sel?.kind === "menus"
     ? sortedMenus.map((m) => ({ slug: m.slug, cells: { slug: m.slug, title: m.title } as Record<string, string>, draft: false, target: { kind: "menu", slug: m.slug } as Sel }))
     : sel?.kind === "documents"
     ? typeDocuments.map((doc) => ({ slug: doc.slug, cells: Object.fromEntries(columns.map(column => [column.key, documentCell(doc, column.key)])), draft: doc.data.draft === true, target: { kind: "document", type: doc.type, id: doc.id } as Sel }))
     : sel?.kind === "pages"
-    ? sortedPages.map((p) => ({ slug: p.slug, cells: { label: p.title, slug: p.slug, path: p.path ?? "—", category: p.category ?? "—" } as Record<string, string>, draft: p.draft, target: p.target }))
+    ? sortedPages.map((p) => ({ slug: p.slug, cells: { label: p.title, slug: p.slug, path: p.path ?? "—", category: p.category ?? (categories.length ? $t("shell.coreCategory") : "—") } as Record<string, string>, draft: p.draft, target: p.target }))
     : sortedPosts.map((p) => ({ slug: p.slug, cells: Object.fromEntries(columns.map((c) => [c.key, cellValue(p, c.key)])), draft: Boolean(p.frontmatter.draft), target: { kind: "post", collection: coll!.name, slug: p.slug } as Sel })));
   const titleColumn = $derived(sel?.kind === "pages" ? "label" : "title");
 
@@ -637,6 +650,11 @@
   }
 
   function openSelection(next: Sel | null) {
+    if (next?.kind === "page" || next?.kind === "document") {
+      if (sel?.kind === "pages" || sel?.kind === "documents") entryList = sel;
+      else if (sel?.kind !== "page" && sel?.kind !== "document") entryList = null;
+    }
+    if (next?.kind === "pages" && next.category !== undefined) pagesFilter = next.category;
     sel = next;
     saveError = "";
     sortBy = "";
@@ -680,17 +698,25 @@
     void tick().then(() => document.querySelector<HTMLButtonElement>(".content-language button[role=combobox]")?.focus({ preventScroll: true }));
   }
 
-  function switchContentLocale(value: string | string[]) {
+  function switchContentLocale(value: string | string[], target?: Sel) {
     localeControlRevision += 1;
     if (typeof value !== "string" || value === contentLocale || !manifest.contentLocales?.locales.some(locale => locale.code === value)) return;
     requestNavigation(() => {
       const destination = contentForLocale(manifest, value);
       selectedContentLocale = value;
+      if (pagesFilter && !pageCategories(destination).includes(pagesFilter)) pagesFilter = null;
+      if (!selectionInContent(destination, entryList)) entryList = null;
       if (!selectionInContent(destination, sel)) openSelection(null);
+      if (target && selectionInContent(destination, target)) openSelection(target);
       focusContentLocale();
     }, focusContentLocale);
   }
 
+  function selectSearch(next: Sel, locale?: string) {
+    if (locale && locale !== contentLocale && manifest.contentLocales?.locales.some(entry => entry.code === locale)) switchContentLocale(locale, next);
+    else select(next);
+  }
+
   function sort(key: string) {
     if (sortBy === key) sortDir = sortDir === 1 ? -1 : 1;
     else {
@@ -726,21 +752,25 @@
     return String(v);
   }
 
-  function newPage(type = pageDocType) {
+  function newPage(type = pageDocType, chooseTemplate = false) {
+    if (chooseTemplate) type = templates.find(type => inPageCategory(type.category, pageCategory)) ?? templates[0];
     if (!type || !schema || type.creatable === false || type.singleton) return;
     actionDialog = {
-      title: $t("shell.addDocument", { name: type.title }), description: $t("shell.newDocumentDescription"), fieldLabel: type.shared ? $t("shell.name") : $t("shell.pageName"), confirmLabel: $t("shell.createDraft"),
-      onconfirm: (title) => {
+      title: $t("shell.addDocument", { name: chooseTemplate ? $t("shell.pages") : type.title }), description: $t("shell.newDocumentDescription"), fieldLabel: type.shared ? $t("shell.name") : $t("shell.pageName"), confirmLabel: $t("shell.createDraft"),
+      ...(chooseTemplate ? { templates, templateCategory: type.category ?? "" } : {}),
+      onconfirm: (title, selectedType) => {
+        const selected = chooseTemplate ? templates.find(entry => entry.name === selectedType) : type;
+        if (!selected) throw new Error($t("shell.chooseTemplate"));
         const slug = slugify(title);
         if (!slug) throw new Error($t("shell.titleRequired"));
-        if (manifest.documents?.some(doc => doc.type === type.name && doc.slug === slug)) throw new Error($t("shell.slugAlreadyUsed", { slug }));
-        const id = `${type.name}:${slug}`;
-        const data = newDocumentFromTemplate(schema, type.name, title, slug);
-        validateDocumentSlugs(schema, [...(manifest.documents ?? []), { id, type: type.name, slug, data }], manifest.preview, $t);
-        newDocument = { type: type.name, id, slug };
+        if (manifest.documents?.some(doc => doc.type === selected.name && doc.slug === slug)) throw new Error($t("shell.slugAlreadyUsed", { slug }));
+        const id = `${selected.name}:${slug}`;
+        const data = newDocumentFromTemplate(schema, selected.name, title, slug);
+        validateDocumentSlugs(schema, [...(manifest.documents ?? []), { id, type: selected.name, slug, data }], manifest.preview, $t);
+        newDocument = { type: selected.name, id, slug };
         draft = JSON.parse(JSON.stringify(data));
         docBase = null;
-        openSelection({ kind: "document", type: type.name, id });
+        openSelection({ kind: "document", type: selected.name, id });
       },
     };
   }
@@ -857,7 +887,7 @@
       <img src={logo} alt="" width="32" height="32" />
       <span>Rigel <span class="brand-suffix">CMS</span></span>
     </a>
-    <TopBar manifest={visibleContent} {sel} onselect={select} />
+    <TopBar {manifest} {sel} {contentLocale} scope={effectiveSearchScope(manifest.search, settings.userPref.searchScope)} onselect={selectSearch} />
     {#if manifest.contentLocales && manifest.contentLocales.locales.length > 1}
       <div class="content-language" data-locale={contentLocale}>
         {#key localeControlRevision}
@@ -957,10 +987,9 @@
         {#if sel.kind === "page" || sel.kind === "post" || sel.kind === "menu" || sel.kind === "document"}
         <div class="editor-actions">
         {#if sel.kind === "page" && page}
-          <p class="back"><button onclick={() => select(page.shared ? null : { kind: "pages", category: page.category })}>{$t("shell.backTo", { name: page.shared ? $t("shell.welcome") : page.category ?? $t("shell.pages") })}</button></p>
+          <p class="back"><button onclick={() => select(page.shared ? null : pageBack)}>{$t("shell.backTo", { name: page.shared ? $t("shell.welcome") : pageBackLabel })}</button></p>
         {:else if sel.kind === "document"}
-          {@const backSel: Sel | null = activeDocType?.singleton ? null : sel.type === pageDocType?.name ? { kind: "pages" } : { kind: "documents", type: sel.type }}
-          <p class="back"><button onclick={() => select(backSel)}>{$t("shell.backTo", { name: activeDocType?.singleton ? $t("shell.welcome") : sel.type === pageDocType?.name ? $t("shell.pages") : activeDocType?.title ?? $t("shell.documents") })}</button></p>
+          <p class="back"><button onclick={() => select(documentBack)}>{$t("shell.backTo", { name: !documentBack ? $t("shell.welcome") : documentBack.kind === "pages" ? pageBackLabel : activeDocType?.title ?? $t("shell.documents") })}</button></p>
         {:else if sel.kind === "post" && coll}
           <p class="back"><button onclick={() => select({ kind: "collection", name: coll.name })}>{$t("shell.backTo", { name: coll.label })}</button></p>
         {:else if sel.kind === "menu"}
@@ -976,8 +1005,25 @@
         {/if}
         <div class="titlebar">
           <h2>{sel.kind === "page" ? page?.label : sel.kind === "menu" ? String(draft.title || menu?.slug || "") : sel.kind === "post" ? String(draft.title || post?.slug || "") : sel.kind === "document" ? activeDocType?.singleton ? activeDocType.title : String(draft.title || draft.name || activeDocument?.slug || sel.id) : listTitle}</h2>
-        {#if (sel?.kind === "collection" && coll) || (sel?.kind === "pages" && pageDocType?.creatable !== false && pageDocType) || (sel?.kind === "documents" && activeDocType && activeDocType.creatable !== false && !activeDocType.singleton)}
-          <button class="primary" onclick={() => (sel?.kind === "collection" ? newPost(coll!) : newPage(sel?.kind === "documents" ? activeDocType : pageDocType))}>{$t("shell.addNew")}</button>
+        {#if sel.kind === "pages"}
+          {#if templates.length}
+            <button class="primary" onclick={() => newPage(pageDocType, true)}>{$t("shell.addNew")}</button>
+          {/if}
+          <div class="pages-controls">
+          {#if categories.length}
+            <Select ariaLabel={$t("shell.category")} value={JSON.stringify(pageCategory)} options={[{ value: "null", label: $t("shell.allPages") }, { value: JSON.stringify(""), label: $t("shell.coreCategory") }, ...categories.map(category => ({ value: JSON.stringify(category), label: category }))]} onchange={(value) => { if (typeof value === "string") { pagesFilter = JSON.parse(value); select({ kind: "pages" }); } }} />
+          {/if}
+            <div class="pages-search">
+              <Icon name="magnifier" size={18} />
+              <input type="search" aria-label={$t("shell.searchPages")} placeholder={$t("shell.searchPages")} bind:value={pagesQuery} bind:this={pagesSearch} />
+              {#if pagesQuery}
+                <button type="button" class="icon-btn" aria-label={$t("fields.clear")} onclick={() => { pagesQuery = ""; pagesSearch.focus(); }}><Icon name="x" size={16} /></button>
+              {/if}
+            </div>
+          </div>
+        {/if}
+        {#if (sel?.kind === "collection" && coll) || (sel?.kind === "documents" && activeDocType && activeDocType.creatable !== false && !activeDocType.singleton)}
+          <button class="primary" onclick={() => (sel?.kind === "collection" ? newPost(coll!) : newPage(sel?.kind === "documents" ? activeDocType : pageDocType, sel?.kind === "pages"))}>{$t("shell.addNew")}</button>
         {/if}
         {#if sel?.kind === "post" && post}
           <button class="icon-btn" aria-label={$t("shell.deletePost")} data-tooltip={$t("shell.deletePost")} disabled={saveState === "saving"} onclick={deletePost}>
@@ -1003,6 +1049,7 @@
       {:else if sel?.kind === "media"}
         <ImagePicker inline />
       {:else if sel?.kind === "pages" || sel?.kind === "documents" || sel?.kind === "menus" || (sel?.kind === "collection" && coll)}
+
         <div class="table-card">
           <table>
             <thead>
@@ -1039,7 +1086,7 @@
                   {/each}
                 </tr>
               {:else}
-                <tr><td colspan={columns.length}>{$t("shell.noEntries")}</td></tr>
+                <tr><td colspan={columns.length}>{$t(sel?.kind === "pages" && pagesQuery.trim() ? "shell.noResults" : "shell.noEntries")}</td></tr>
               {/each}
             </tbody>
           </table>
@@ -1144,7 +1191,7 @@
 {/if}
 
 {#if settingsOpen}
-  <Settings bind:s={settings} github={githubMode ? manifest.github : undefined} user={githubAccess?.user} error={settingsError} saving={saveState === "saving"} onerase={eraseBrowserData} onclose={() => (settingsOpen = false)} />
+  <Settings bind:s={settings} search={manifest.search} contentLocales={manifest.contentLocales} 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)} />

package/src/editor/i18n/de/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Inhaltssprachen durchsuchen",
+  "shell.searchScopeDefault": "Website-Standard ({scope})",
+  "shell.searchScopeAll": "Alle Sprachen",
+  "shell.searchScopeCurrent": "Aktuelle Inhaltssprache",
+  "shell.coreCategory": "Standard",
+  "shell.searchPages": "Seiten suchen",
+  "shell.template": "Vorlage",
+  "shell.chooseTemplate": "Vorlage auswählen",
   "shell.search": "Suchen",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Dialog schließen",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "navigieren",
   "shell.searchOpen": "öffnen",
   "shell.searchClose": "schließen",
-  "shell.appearance": "Darstellung",
+  "shell.interface": "Benutzeroberfläche",
   "shell.editor": "Editor",
   "shell.connection": "Verbindung",
   "shell.media": "Medien",

package/src/editor/i18n/en/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Search content languages",
+  "shell.searchScopeDefault": "Website default ({scope})",
+  "shell.searchScopeAll": "All languages",
+  "shell.searchScopeCurrent": "Current content language",
+  "shell.coreCategory": "Core",
+  "shell.searchPages": "Search pages",
+  "shell.template": "Template",
+  "shell.chooseTemplate": "Choose a template",
   "shell.search": "Search",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Close dialog",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "navigate",
   "shell.searchOpen": "open",
   "shell.searchClose": "close",
-  "shell.appearance": "Appearance",
+  "shell.interface": "Interface",
   "shell.editor": "Editor",
   "shell.connection": "Connection",
   "shell.media": "Media",

package/src/editor/i18n/es/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Idiomas del contenido de búsqueda",
+  "shell.searchScopeDefault": "Predeterminado del sitio ({scope})",
+  "shell.searchScopeAll": "Todos los idiomas",
+  "shell.searchScopeCurrent": "Idioma actual del contenido",
+  "shell.coreCategory": "Principales",
+  "shell.searchPages": "Buscar páginas",
+  "shell.template": "Plantilla",
+  "shell.chooseTemplate": "Elige una plantilla",
   "shell.search": "Buscar",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Cerrar diálogo",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "navegar",
   "shell.searchOpen": "abrir",
   "shell.searchClose": "cerrar",
-  "shell.appearance": "Apariencia",
+  "shell.interface": "Interfaz",
   "shell.editor": "Editor",
   "shell.connection": "Conexión",
   "shell.media": "Archivos multimedia",

package/src/editor/i18n/fr/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Langues du contenu recherché",
+  "shell.searchScopeDefault": "Par défaut du site ({scope})",
+  "shell.searchScopeAll": "Toutes les langues",
+  "shell.searchScopeCurrent": "Langue actuelle du contenu",
+  "shell.coreCategory": "Principales",
+  "shell.searchPages": "Rechercher des pages",
+  "shell.template": "Modèle",
+  "shell.chooseTemplate": "Choisir un modèle",
   "shell.search": "Rechercher",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Fermer la boîte de dialogue",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "parcourir",
   "shell.searchOpen": "ouvrir",
   "shell.searchClose": "fermer",
-  "shell.appearance": "Apparence",
+  "shell.interface": "Interface",
   "shell.editor": "Éditeur",
   "shell.connection": "Connexion",
   "shell.media": "Médias",

package/src/editor/i18n/it/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Lingue dei contenuti da cercare",
+  "shell.searchScopeDefault": "Predefinito del sito ({scope})",
+  "shell.searchScopeAll": "Tutte le lingue",
+  "shell.searchScopeCurrent": "Lingua attuale del contenuto",
+  "shell.coreCategory": "Principali",
+  "shell.searchPages": "Cerca pagine",
+  "shell.template": "Modello",
+  "shell.chooseTemplate": "Scegli un modello",
   "shell.search": "Cerca",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Chiudi finestra",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "naviga",
   "shell.searchOpen": "apri",
   "shell.searchClose": "chiudi",
-  "shell.appearance": "Aspetto",
+  "shell.interface": "Interfaccia",
   "shell.editor": "Editor",
   "shell.connection": "Connessione",
   "shell.media": "Media",

package/src/editor/i18n/ja/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "検索するコンテンツの言語",
+  "shell.searchScopeDefault": "サイトの既定値（{scope}）",
+  "shell.searchScopeAll": "すべての言語",
+  "shell.searchScopeCurrent": "現在のコンテンツ言語",
+  "shell.coreCategory": "基本",
+  "shell.searchPages": "ページを検索",
+  "shell.template": "テンプレート",
+  "shell.chooseTemplate": "テンプレートを選択",
   "shell.search": "検索",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "ダイアログを閉じる",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "移動",
   "shell.searchOpen": "開く",
   "shell.searchClose": "閉じる",
-  "shell.appearance": "外観",
+  "shell.interface": "インターフェース",
   "shell.editor": "エディター",
   "shell.connection": "接続",
   "shell.media": "メディア",

package/src/editor/i18n/nl/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Inhoudstalen doorzoeken",
+  "shell.searchScopeDefault": "Websitestandaard ({scope})",
+  "shell.searchScopeAll": "Alle talen",
+  "shell.searchScopeCurrent": "Huidige inhoudstaal",
+  "shell.coreCategory": "Standaard",
+  "shell.searchPages": "Pagina’s zoeken",
+  "shell.template": "Sjabloon",
+  "shell.chooseTemplate": "Kies een sjabloon",
   "shell.search": "Zoeken",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Dialoogvenster sluiten",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "navigeren",
   "shell.searchOpen": "openen",
   "shell.searchClose": "sluiten",
-  "shell.appearance": "Weergave",
+  "shell.interface": "Interface",
   "shell.editor": "Editor",
   "shell.connection": "Verbinding",
   "shell.media": "Media",

package/src/editor/i18n/ru/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "Языки содержимого для поиска",
+  "shell.searchScopeDefault": "По умолчанию на сайте ({scope})",
+  "shell.searchScopeAll": "Все языки",
+  "shell.searchScopeCurrent": "Текущий язык содержимого",
+  "shell.coreCategory": "Основные",
+  "shell.searchPages": "Поиск страниц",
+  "shell.template": "Шаблон",
+  "shell.chooseTemplate": "Выберите шаблон",
   "shell.search": "Поиск",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "Закрыть диалог",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "перемещение",
   "shell.searchOpen": "открыть",
   "shell.searchClose": "закрыть",
-  "shell.appearance": "Оформление",
+  "shell.interface": "Интерфейс",
   "shell.editor": "Редактор",
   "shell.connection": "Подключение",
   "shell.media": "Медиафайлы",

package/src/editor/i18n/zh/shell.json

@@ -1,4 +1,12 @@
 {
+  "shell.searchScope": "搜索内容语言",
+  "shell.searchScopeDefault": "网站默认（{scope}）",
+  "shell.searchScopeAll": "所有语言",
+  "shell.searchScopeCurrent": "当前内容语言",
+  "shell.coreCategory": "基础",
+  "shell.searchPages": "搜索页面",
+  "shell.template": "模板",
+  "shell.chooseTemplate": "选择模板",
   "shell.search": "搜索",
   "shell.searchShortcut": "⌘/Ctrl + K",
   "shell.closeDialog": "关闭对话框",
@@ -21,7 +29,7 @@
   "shell.searchNavigate": "切换",
   "shell.searchOpen": "打开",
   "shell.searchClose": "关闭",
-  "shell.appearance": "外观",
+  "shell.interface": "界面",
   "shell.editor": "编辑器",
   "shell.connection": "连接",
   "shell.media": "媒体",

package/src/editor/lib/ActionDialog.svelte

@@ -1,9 +1,13 @@
 <script lang="ts">
   import { t } from "../i18n";
   import Icon from "./Icon.svelte";
-  let { title, description, confirmLabel, fieldLabel, danger = false, onconfirm, onclose }: {
+  import Select from "./Select.svelte";
+  import { untrack } from "svelte";
+  import type { DocumentDef } from "../../schema/types";
+  let { title, description, confirmLabel, fieldLabel, danger = false, templates, templateCategory, onconfirm, onclose }: {
     title: string; description: string; confirmLabel: string; fieldLabel?: string; danger?: boolean;
-    onconfirm: (value: string) => void | Promise<void>; onclose: () => void;
+    templates?: DocumentDef[]; templateCategory?: string;
+    onconfirm: (value: string, type?: string) => void | Promise<void>; onclose: () => void;
   } = $props();
   let dialog: HTMLDialogElement;
   let cancel: HTMLButtonElement;
@@ -11,6 +15,11 @@
   let value = $state("");
   let busy = $state(false);
   let error = $state("");
+  let category = $state(untrack(() => templateCategory ?? ""));
+  let selectedTemplate = $state("");
+  const categories = $derived([...new Set((templates ?? []).map(type => type.category ?? ""))].sort());
+  const candidates = $derived((templates ?? []).filter(type => (type.category ?? "") === category));
+  const template = $derived(candidates.length === 1 ? candidates[0].name : selectedTemplate);
   $effect(() => {
     dialog.showModal();
     (fieldLabel ? input : cancel).focus();
@@ -20,7 +29,10 @@
     if (busy) return;
     busy = true;
     error = "";
-    try { await onconfirm(value.trim()); onclose(); }
+    try {
+      if (templates && !candidates.some(type => type.name === template)) throw new Error($t("shell.chooseTemplate"));
+      await onconfirm(value.trim(), template); onclose();
+    }
     catch (cause) { error = cause instanceof Error ? cause.message : $t("connection.actionFailed"); }
     finally { busy = false; }
   }
@@ -31,6 +43,14 @@
     <div class="action-head"><h2 id="action-title">{title}</h2><button type="button" class="icon-btn" aria-label={$t("connection.cancel")} disabled={busy} onclick={onclose}><Icon name="x" size={16} /></button></div>
     <p id="action-description">{description}</p>
     {#if fieldLabel}<label><span>{fieldLabel}</span><input type="text" bind:this={input} bind:value required disabled={busy} /></label>{/if}
+    {#if templates}
+      {#if categories.some(category => category !== "")}
+        <Select label={$t("shell.category")} value={category} options={categories.map(value => ({ value, label: value || $t("shell.coreCategory") }))} disabled={busy} onchange={(value) => { if (typeof value === "string") { category = value; selectedTemplate = ""; error = ""; } }} />
+      {/if}
+      {#if candidates.length > 1}
+        <Select label={$t("shell.template")} value={selectedTemplate} options={[{ value: "", label: $t("shell.chooseTemplate"), disabled: true }, ...candidates.map(type => ({ value: type.name, label: type.title }))]} disabled={busy} onchange={(value) => { if (typeof value === "string") selectedTemplate = value; }} />
+      {/if}
+    {/if}
     {#if error}<p class="error" role="alert">{error}</p>{/if}
     <div class="action-actions">
       <button type="button" bind:this={cancel} disabled={busy} onclick={onclose}>{$t("connection.cancel")}</button>

package/src/editor/lib/MarkdownEditor.svelte

@@ -14,7 +14,7 @@
   import type { SelectionBookmark } from "prosemirror-state";
   import { parseVisualMarkdown, serializeMarkdown, safeMarkdownUrl, schema } from "./rich-markdown";
 
-  let { value, label, oninput }: { value: string; label: string; oninput: (value: string) => void } = $props();
+  let { value, label, oninput, editableRoot }: { value: string; label: string; oninput: (value: string) => void; editableRoot?: HTMLElement } = $props();
   const id = $props.id();
   let host: HTMLDivElement;
   let mode = $state<"visual" | "source">("visual");
@@ -66,9 +66,10 @@
   }
 
   $effect(() => {
-    if (!host) return;
+    if (!editableRoot && !host) return;
     if (!view) {
-      view = new EditorView(host, {
+      if (editableRoot) editableRoot.classList.add("rigel-markdown-content");
+      view = new EditorView(editableRoot ? { mount: editableRoot } : host, {
         state: EditorState.create({ schema }),
         attributes: { role: "textbox", "aria-label": label, "aria-multiline": "true" },
         dispatchTransaction(transaction) {
@@ -92,6 +93,7 @@
       load(value);
     }
   });
+  $effect(() => { const editable = mode === "visual"; view?.setProps({ editable: () => editable }); });
   onDestroy(() => view?.destroy());
 
   function activeMark(type: string) {
@@ -162,7 +164,7 @@
 
 <svelte:window onpointerdown={event => { if (linkOpen && !document.getElementById(`${id}-link`)?.contains(event.target as Node) && !linkButton?.contains(event.target as Node)) linkOpen = false; }} />
 
-<div class="markdown-editor body-editor">
+<div class="markdown-editor body-editor" class:markdown-inline={!!editableRoot}>
   <div class="markdown-heading">
     <div class="field-label" id={`${id}-label`}>{label}</div>
     <div class="markdown-modes" role="group" aria-label={$t("richtext.editingMode", { label })}>
@@ -199,7 +201,7 @@
         {#if linkError}<p id={`${id}-error`} role="alert">{linkError}</p>{/if}
       </div>
     {/if}
-    <div class="md-preview rich-text" bind:this={host}></div>
+    {#if !editableRoot}<div class="md-preview rich-text" bind:this={host}></div>{/if}
   </div>
   {#if mode === "source"}
     <textarea class="mono" rows="14" aria-label={$t("richtext.markdownSource", { label })} value={value} oninput={(event) => { warning = ""; emit(event.currentTarget.value); }}></textarea>

package/src/editor/lib/Settings.svelte

@@ -5,9 +5,13 @@
   import type { Manifest } from "../../manifest/types";
   import type { GitHubAccess } from "./github-auth";
   import Icon from "./Icon.svelte";
+  import Select from "./Select.svelte";
+  import { effectiveSearchScope } from "../../manifest/search";
 
-  let { s = $bindable(), github, user, error, saving, onerase, onclose }: {
+  let { s = $bindable(), search, contentLocales, github, user, error, saving, onerase, onclose }: {
     s: RigelSettings;
+    search?: Manifest["search"];
+    contentLocales?: Manifest["contentLocales"];
     github?: Manifest["github"];
     user?: GitHubAccess["user"];
     error: string;
@@ -16,8 +20,8 @@
     onclose: () => void;
   } = $props();
 
-  type PaneId = "appearance" | "editor" | "connection" | "media" | "language" | "advanced";
-  let active: PaneId = $state("appearance");
+  type PaneId = "interface" | "content" | "connection" | "media" | "advanced";
+  let active: PaneId = $state("interface");
 
   const providerIds = Object.keys(STOCK_PROVIDERS) as (keyof typeof STOCK_PROVIDERS)[];
   let keys = $state(getKeys());
@@ -26,20 +30,20 @@
   let eraseError = $state("");
 
   const panes: { id: PaneId; label: string }[] = $derived([
-    { id: "appearance", label: $t("shell.appearance") },
-    { id: "editor", label: $t("shell.editor") },
+    { id: "interface", label: $t("shell.interface") },
+    { id: "content", label: $t("shell.content") },
     { id: "connection", label: $t("shell.connection") },
     { id: "media", label: $t("shell.media") },
-    { id: "language", label: $t("shell.language") },
+
     { id: "advanced", label: $t("shell.advanced") },
   ]);
 
   const PANE_ICONS = {
-    appearance: "palette",
-    editor: "textB",
+    interface: "palette",
+    content: "fileText",
     connection: "user",
     media: "image",
-    language: "translate",
+
     advanced: "wrench",
   } as const;
 
@@ -71,6 +75,7 @@
         {#each panes as p (p.id)}
           <button
             class:active={active === p.id}
+            aria-current={active === p.id ? "true" : undefined}
             onclick={() => (active = p.id)}
           >
             <span class="pico"><Icon name={PANE_ICONS[p.id]} size={24} /></span>
@@ -79,9 +84,9 @@
         {/each}
       </nav>
 
-      <div class="settings-pane">
-        {#if active === "appearance"}
-          <h3>{$t("shell.appearance")}</h3>
+      <div class="settings-pane" role="region" aria-label={panes.find(p => p.id === active)?.label}>
+        {#if active === "interface"}
+
           <fieldset>
             <legend>{$t("shell.theme")}</legend>
             <div class="theme-options">
@@ -101,17 +106,30 @@
             </label>
             <p class="hint" id="high-contrast-hint">{$t("shell.highContrastHint")}</p>
           </fieldset>
-
-        {:else if active === "editor"}
-          <h3>{$t("shell.editorExperience")}</h3>
           <fieldset>
-            <legend>{$t("shell.articleBodyEditing")}</legend>
-            <label class="radio"><input type="radio" bind:group={s.userPref.editorExperience} value="sidebar" /><span>{$t("shell.sidebar")}</span></label>
-            <label class="radio"><input type="radio" bind:group={s.userPref.editorExperience} value="inline" /><span>{$t("shell.inlinePreview")}</span></label>
+            <legend>{$t("shell.editorInterfaceLanguage")}</legend>
+            {#each availableLocales as lang}
+              <label class="radio">
+                <input type="radio" bind:group={s.language} value={lang} />
+                <span>{localeNames[lang]}</span>
+              </label>
+            {/each}
           </fieldset>
+
+        {:else if active === "content"}
+
+          <Select label={$t("shell.articleBodyEditing")} value={s.userPref.editorExperience ?? "inline"} options={[
+            { value: "sidebar", label: $t("shell.sidebar") },
+            { value: "inline", label: $t("shell.inlinePreview") },
+          ]} onchange={value => s.userPref.editorExperience = value === "sidebar" ? "sidebar" : "inline"} />
           <p class="hint">{$t("shell.editorExperienceHint")}</p>
+          <Select label={$t("shell.searchScope")} value={s.userPref.searchScope ?? "inherit"} options={[
+            { value: "inherit", label: $t("shell.searchScopeDefault", { scope: $t(effectiveSearchScope(search, undefined) === "all" ? "shell.searchScopeAll" : "shell.searchScopeCurrent") }) },
+            { value: "all", label: $t("shell.searchScopeAll") },
+            { value: "currentLocale", label: $t("shell.searchScopeCurrent"), disabled: !contentLocales || contentLocales.locales.length < 2 },
+          ]} onchange={value => s.userPref.searchScope = value === "all" || value === "currentLocale" ? value : undefined} />
         {:else if active === "connection"}
-          <h3>{$t("shell.connection")}</h3>
+
           {#if github}
             <dl class="connection-details">
               <dt>{$t("shell.githubAccount")}</dt>
@@ -165,17 +183,6 @@
 
           </section>
 
-        {:else if active === "language"}
-          <h3>{$t("shell.language")}</h3>
-          <fieldset>
-            <legend>{$t("shell.editorInterfaceLanguage")}</legend>
-            {#each availableLocales as lang}
-              <label class="radio">
-                <input type="radio" bind:group={s.language} value={lang} />
-                <span>{localeNames[lang]}</span>
-              </label>
-            {/each}
-          </fieldset>
 
         {:else}
           <h3>{$t("shell.developerMode")}</h3>

package/src/editor/lib/TopBar.svelte

@@ -4,6 +4,8 @@
   import SidebarIcon from "./SidebarIcon.svelte";
   import { tick } from "svelte";
   import type { Manifest } from "../../manifest/types";
+  import { searchIndex, type SearchHit } from "../../manifest/search";
+  import type { SearchScope } from "../../config";
 
   type Sel =
     | { kind: "media" }
@@ -20,10 +22,14 @@
     manifest,
     sel,
     onselect,
+    scope = "all",
+    contentLocale,
   }: {
     manifest: Manifest;
     sel: Sel | null;
-    onselect: (s: Sel) => void;
+    onselect: (s: Sel, locale?: string) => void;
+    scope?: SearchScope;
+    contentLocale?: string;
   } = $props();
 
   let open = $state(false);
@@ -35,53 +41,11 @@
     if (open) inputEl?.focus();
   });
 
-  interface Hit {
-    label: string;
-    hint: string;
-    action: () => void;
-  }
-
-  const hits = $derived.by((): Hit[] => {
-    const q = query.trim().toLowerCase();
-    const all: Hit[] = [];
-    for (const p of manifest.pages) {
-      all.push({
-        label: p.label,
-        hint: $t("shell.page"),
-        action: () => onselect({ kind: "page", slug: p.slug }),
-      });
-    }
-    for (const doc of manifest.documents ?? []) {
-      all.push({
-        label: String(doc.data.title ?? doc.data.name ?? doc.slug),
-        hint: $t("shell.searchItemHint", { name: doc.type, slug: doc.slug }),
-        action: () => onselect({ kind: "document", type: doc.type, id: doc.id }),
-      });
-    }
-    for (const c of manifest.collections ?? []) {
-      all.push({
-        label: c.label,
-        hint: $t("shell.collection"),
-        action: () => onselect({ kind: "collection", name: c.name }),
-      });
-      for (const po of c.posts) {
-        all.push({
-          label: String(po.frontmatter.title ?? po.slug),
-          hint: $t("shell.searchItemHint", { name: c.label, slug: po.slug }),
-          action: () => onselect({ kind: "post", collection: c.name, slug: po.slug }),
-        });
-      }
-    }
-    if (manifest.menus) {
-      all.push({ label: $t("shell.menus"), hint: $t("shell.collection"), action: () => onselect({ kind: "menus" }) });
-      for (const m of manifest.menus.entries) all.push({ label: m.title, hint: $t("shell.searchMenuHint", { slug: m.slug }), action: () => onselect({ kind: "menu", slug: m.slug }) });
-    }
-    if (!q) return all.slice(0, 12);
-    return all.filter((h) => h.label.toLowerCase().includes(q) || h.hint.toLowerCase().includes(q)).slice(0, 12);
-  });
+  const index = $derived(searchIndex(manifest, scope, contentLocale, $t));
+  const hits = $derived(index.filter(hit => [hit.label, hit.hint, hit.language ?? ""].some(value => value.toLowerCase().includes(query.trim().toLowerCase()))).slice(0, 12));
 
-  function trigger(h: Hit) {
-    h.action();
+  function trigger(h: SearchHit) {
+    onselect(h.selection, h.locale);
     open = false;
     query = "";
     active = -1;
@@ -145,10 +109,10 @@
         <kbd>{$t("shell.escapeKeyLowercase")}</kbd>
       </div>
       <ul id="rigel-search-results" role="listbox" aria-label={$t("shell.searchResults")}>
-        {#each hits as h, i (h.hint + h.label)}
+        {#each hits as h, i (h.id)}
           <li role="presentation">
             <button id={`rigel-search-hit-${i}`} role="option" aria-selected={active === i} onfocus={() => active = i} onclick={() => trigger(h)}>
-              <span>{h.label}</span>
+              <span>{h.label}{#if h.language}<span class="badge search-language" title={h.language} aria-label={h.language}>{h.locale?.slice(0, 2).toUpperCase()}</span>{/if}</span>
               <span class="hint">{h.hint}</span>
             </button>
           </li>

package/src/editor/lib/VisualEditor.svelte

@@ -52,7 +52,7 @@
   let bodyScope: HTMLElement | null = null;
   let removeTooltips: (() => void) | undefined;
   let mode = $state<"browse" | "edit">("edit");
-  let panelOpen = $state(true);
+  let panelOpen = $state(false);
   let editorWidth = $state(0);
   let requestedWidth = $state(340);
   let resizing = $state(false);
@@ -262,19 +262,21 @@
     clearHover(); clearHighlight();
     editingBody = element; bodyContents = [...element.childNodes];
     const scope = doc.createElement("div");
+    bodyAttributes = ["class", "style", "role", "aria-label", "aria-multiline", "contenteditable", "tabindex", "translate"].map(name => [name, element.getAttribute(name)]);
     const syncTheme = () => { scope.dataset.theme = document.documentElement.dataset.theme; scope.dataset.contrast = document.documentElement.dataset.contrast; };
     syncTheme();
     const host = doc.createElement("div"); host.className = "rigel rigel-inline";
-    scope.append(host); element.replaceChildren(scope); bodyScope = scope;
+    scope.append(host); doc.body.append(scope); bodyScope = scope;
     removeTooltips = tooltipRoot(host).destroy;
     bodyEditor = mount(MarkdownEditor, { target: host, props: {
+      editableRoot: element,
       label: def.labelKey ? $t(def.labelKey) : def.label,
       get value() { return String(anchorValue(values, field.path).value ?? ""); },
       oninput: (next: string) => onchange(replaceAt(values, field.path, next)),
     } });
     bodyThemeObserver = new MutationObserver(syncTheme);
     bodyThemeObserver.observe(document.documentElement, { attributes: true, attributeFilter: ["data-theme", "data-contrast"] });
-    void tick().then(() => host.querySelector<HTMLElement>('[contenteditable="true"], textarea')?.focus());
+    void tick().then(() => (element.isContentEditable ? element : host.querySelector<HTMLTextAreaElement>("textarea"))?.focus());
     return true;
   }
 
@@ -393,7 +395,7 @@
 
   function setMode(next: "browse" | "edit") {
     mode = next;
-    panelOpen = next === "edit";
+    panelOpen = false;
     if (next === "browse") {
       clearHighlight();
       clearHover();

package/src/editor/lib/settings.ts

@@ -3,6 +3,7 @@ import type { StockKeys } from "./images";
 import { availableLocales, setLocale, type Locale } from "../i18n";
 
 export interface RigelUserPref {
+  searchScope?: "all" | "currentLocale";
   sidebarCollapsed?: boolean;
   editorExperience?: "sidebar" | "inline";
   previewSplit: number;
@@ -46,6 +47,7 @@ export function getSettings(): RigelSettings {
       highContrast: typeof saved?.highContrast === "boolean" ? saved.highContrast : DEFAULTS.highContrast,
       apiKeys: mergedKeys,
       userPref: {
+        searchScope: saved?.userPref?.searchScope === "all" || saved?.userPref?.searchScope === "currentLocale" ? saved.userPref.searchScope : undefined,
         sidebarCollapsed: saved?.userPref?.sidebarCollapsed === true,
         editorExperience: saved?.userPref?.editorExperience === "sidebar" ? "sidebar" : DEFAULTS.userPref.editorExperience,
         previewSplit: typeof saved?.userPref?.previewSplit === "number" && Number.isFinite(saved.userPref.previewSplit) && saved.userPref.previewSplit >= 0.2 && saved.userPref.previewSplit <= 0.8

package/src/editor/styles.css

@@ -408,6 +408,15 @@
 .rigel .titlebar { display: flex; align-items: center; flex-wrap: wrap; gap: 0.75rem 1.5rem; }
 .rigel .titlebar h2 { min-width: 0; overflow-wrap: anywhere; }
 .rigel .titlebar > button { flex-shrink: 0; }
+.rigel .pages-controls button[role="combobox"], .rigel .pages-search input[type="search"] { padding-top: 0.375rem; padding-bottom: 0.375rem; font-size: 0.8125rem; line-height: normal; }
+.rigel .pages-controls { display: flex; align-items: center; justify-content: flex-end; flex-wrap: wrap; gap: 0.75rem; margin-left: auto; min-width: 0; max-width: 100%; }
+.rigel .pages-controls .custom-select { max-width: 100%; }
+.rigel .pages-search { position: relative; width: 240px; max-width: 100%; color: var(--text-muted); }
+.rigel .pages-search > svg { position: absolute; left: 0.75rem; top: 50%; transform: translateY(-50%); pointer-events: none; }
+.rigel .pages-search input[type="search"] { padding-left: 2.25rem; padding-right: 2.75rem; }
+.rigel .pages-search input::-webkit-search-cancel-button { appearance: none; }
+.rigel .pages-search .icon-btn { position: absolute; right: 0; top: 0; height: 100%; width: 2.5rem; }
+
 .rigel .editor-actions { display: flex; align-items: center; gap: 0.75rem; margin-bottom: 1rem; }
 .rigel .editor-actions .back { display: flex; min-width: 0; margin: 0; }
 .rigel .editor-actions .back button, .rigel .editor-actions .save-button { height: 2.25rem; padding: 0.5rem 0.75rem; border-width: 1px; border-style: solid; font-family: inherit; font-size: 0.8125rem; font-weight: 500; line-height: 1.25; }
@@ -567,6 +576,7 @@
 .rigel .palette li button:hover,
 .rigel .palette li button:focus-visible { background: var(--accent-soft); color: var(--on-accent-soft); }
 .rigel .palette .hint { color: var(--text-muted); font-size: 0.75rem; font-weight: 400; }
+.rigel .palette .search-language { margin-left: 0.5rem; }
 .rigel .palette li button[aria-selected="true"] .hint,
 .rigel .palette li button:hover .hint,
 .rigel .palette li button:focus-visible .hint { color: var(--on-accent-soft); }
@@ -1183,6 +1193,9 @@
 .rigel.rigel-inline .markdown-link, .rigel .block-editor .markdown-link { position: fixed; inset: auto; width: 340px; max-width: calc(100vw - 16px); z-index: 121; }
 .rigel.rigel-inline .block-markdown-view { position: fixed; inset: 12px; max-height: calc(100vh - 24px); overflow: auto; padding: 0.5rem; border: 1px solid var(--border-control); background: var(--panel); }
 .rigel-article-content:focus { outline: 0; }
+.rigel.rigel-inline .markdown-inline { position: fixed; top: 8px; left: 8px; width: max-content; max-width: calc(100vw - 16px); max-height: calc(100vh - 16px); overflow: auto; background: var(--panel); border: 1px solid var(--border-control); box-shadow: var(--shadow-lg); pointer-events: auto; }
+.rigel .markdown-editor [hidden] { display: none !important; }
+.rigel-markdown-content { white-space: pre-wrap; overflow-wrap: anywhere; }
 :is(.rigel .block-content, .rigel-article-content)::highlight(rigel-link-selection), :is(.rigel .block-content, .rigel-article-content) ::highlight(rigel-link-selection) { background-color: Highlight; color: HighlightText; }
 .rigel-article-content:focus-visible > [data-rigel-active-block] { outline: 3px solid Highlight; outline-offset: 3px; }
 .rigel-article-content .block-bold { font-weight: 700; }
@@ -1316,6 +1329,7 @@
 .rigel .reorder-status { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; }
 .rigel .structure-list li.active { border-color: var(--accent); }
 .rigel .structure-row { flex: 1; min-width: 0; display: flex; justify-content: space-between; gap: 0.5rem; align-items: center; border: 0; border-radius: 0; background: transparent; color: var(--text); padding: 0.5rem; text-align: left; cursor: pointer; font-size: 0.8125rem; }
+.rigel .structure-row > span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .rigel .structure-actions, .rigel .schema-item-actions { display: flex; align-items: center; }
 .rigel .structure-actions button, .rigel .schema-item-actions button { border: 0; border-left: 1px solid var(--border); border-radius: 0; background: transparent; color: var(--text-2); cursor: pointer; }
 .rigel .structure-actions button:disabled, .rigel .schema-item-actions button:disabled { opacity: 0.35; cursor: default; }

package/src/index.ts

@@ -115,7 +115,7 @@ export { validateMenu } from "./manifest/menu";
 export type { MenuItem, MenuDocument } from "./manifest/menu";
 export { defineCopy } from "./manifest/types";
 export type { CopyField, CopyGroup, CopyPage, Manifest, CollectionField } from "./manifest/types";
-export type { RigelConfig, CollectionConfig, ContentLocalesConfig } from "./config";
+export type { RigelConfig, CollectionConfig, ContentLocalesConfig, SearchScope } from "./config";
 export type { JsonOutput } from "./json-output";
 export type { ReferenceOption } from "./manifest/references";
 export type { SidebarEntry, SidebarTarget, SidebarIconName } from "./manifest/navigation";

package/src/manifest/navigation.ts

@@ -1,4 +1,5 @@
 import type { Manifest } from "./types";
+import { pageCategories } from "./pages";
 import { systemMessage, type Translator } from "../editor/i18n/format";
 
 export type Selection =
@@ -31,8 +32,7 @@ export function navigationKey(target: Selection): string {
 export function buildSidebar(manifest: Manifest, message: Translator = systemMessage): SidebarNode[] {
   const link = (target: SidebarTarget, label: string): SidebarLink => ({ kind: "link", target, label });
   const types = manifest.schema?.documents ?? [];
-  const pages = manifest.pages.filter(page => !page.shared);
-  const categories = [...new Set([...pages, ...types.filter(type => !type.shared)].map(entry => entry.category).filter((category): category is string => !!category))].sort();
+  const categories = pageCategories(manifest);
   const defaults: SidebarNode[] = [
     { kind: "heading", label: message("system.sidebar.website") },
     link({ kind: "pages" }, message("system.sidebar.pages")),

package/src/manifest/pages.ts

@@ -0,0 +1,13 @@
+import type { Manifest } from "./types";
+
+export function pageCategories(manifest: Manifest): string[] {
+  return [...new Set([...manifest.pages, ...(manifest.schema?.documents ?? [])].filter(entry => !entry.shared).map(entry => entry.category).filter((category): category is string => !!category))].sort();
+}
+
+export function pageTemplates(manifest: Manifest) {
+  return (manifest.schema?.documents ?? []).filter(type => !type.shared && !type.singleton && type.creatable !== false);
+}
+
+export function inPageCategory(category: string | undefined, filter: string | null): boolean {
+  return filter === null || (category ?? "") === filter;
+}

package/src/manifest/search.ts

@@ -0,0 +1,41 @@
+import type { SearchScope } from "../config";
+import type { Manifest } from "./types";
+import type { Selection } from "./navigation";
+import { contentForLocale } from "./content-locales";
+
+export interface SearchHit {
+  id: string;
+  label: string;
+  hint: string;
+  locale?: string;
+  language?: string;
+  selection: Selection;
+}
+
+export function effectiveSearchScope(config: Manifest["search"], override: unknown): SearchScope {
+  return override === "all" || override === "currentLocale" ? override : config?.scope === "currentLocale" ? "currentLocale" : "all";
+}
+
+export function searchIndex(manifest: Manifest, scope: SearchScope, locale: string | undefined, t: (key: string, params?: Record<string, string>) => string): SearchHit[] {
+  const content = scope === "currentLocale" ? contentForLocale(manifest, locale) : manifest;
+  const hits = new Map<string, SearchHit>();
+  function add(selection: Selection, label: string, hint: string, code?: string) {
+    const id = JSON.stringify(selection);
+    const language = manifest.contentLocales && manifest.contentLocales.locales.length > 1 ? manifest.contentLocales.locales.find(entry => entry.code === code)?.label : undefined;
+    if (!hits.has(id)) hits.set(id, { id, label, hint, selection, locale: code, language });
+  }
+  for (const page of content.pages) add({ kind: "page", slug: page.slug }, page.label, t("shell.page"), page.locale);
+  for (const doc of content.documents ?? []) {
+    const type = content.schema?.documents.find(type => type.name === doc.type);
+    add({ kind: "document", type: doc.type, id: doc.id }, String(doc.data.title ?? doc.data.name ?? doc.slug), t("shell.searchItemHint", { name: doc.type, slug: doc.slug }), type?.locale);
+  }
+  for (const collection of content.collections ?? []) {
+    add({ kind: "collection", name: collection.name }, collection.label, t("shell.collection"), collection.locale);
+    for (const post of collection.posts) add({ kind: "post", collection: collection.name, slug: post.slug }, String(post.frontmatter.title ?? post.slug), t("shell.searchItemHint", { name: collection.label, slug: post.slug }), collection.locale);
+  }
+  if (content.menus) {
+    add({ kind: "menus" }, t("shell.menus"), t("shell.collection"));
+    for (const menu of content.menus.entries) add({ kind: "menu", slug: menu.slug }, menu.title, t("shell.searchMenuHint", { slug: menu.slug }));
+  }
+  return [...hits.values()];
+}

package/src/manifest/types.ts

@@ -38,6 +38,7 @@ export interface GitHubBackendConfig {
 
 export interface Manifest {
   contentLocales?: import("../config").ContentLocalesConfig;
+  search?: { scope: import("../config").SearchScope };
   backend?: "github";
   github?: GitHubBackendConfig;
   sidebar?: import("./navigation").SidebarEntry[];

package/src/vite/manifest-plugin.ts

@@ -169,6 +169,7 @@ export const menus = {
           demo: cfg.demo,
           languages: cfg.languages,
           contentLocales: cfg.contentLocales,
+          search: cfg.search,
           publicDir: publicDir?.href,
           mediaDir: cfg.mediaDir,
           maxFileSize: cfg.maxFileSize,
@@ -218,7 +219,7 @@ ${collectionCode}
 ];
 for (const collection of collections) __rigelAssertUniqueUrlSlugs(collection.posts.map(post => ({ slug: post.slug, values: post.frontmatter })));
 ${menuCode}
-export default { pages, collections, documents${cfg.contentLocales ? ", contentLocales: " + JSON.stringify(cfg.contentLocales) : ""}${github ? ', backend: "github", github: ' + JSON.stringify(github) : ""}${cfg.menus ? ", menus" : ""}${cfg.schema ? ", schema: " + JSON.stringify(cfg.schema) : ""}${cfg.preview ? ", preview: " + JSON.stringify(cfg.preview) : ""}${cfg.sidebar ? ", sidebar: " + JSON.stringify(cfg.sidebar) : ""} };
+export default { pages, collections, documents, search: ${JSON.stringify(cfg.search)}${cfg.contentLocales ? ", contentLocales: " + JSON.stringify(cfg.contentLocales) : ""}${github ? ', backend: "github", github: ' + JSON.stringify(github) : ""}${cfg.menus ? ", menus" : ""}${cfg.schema ? ", schema: " + JSON.stringify(cfg.schema) : ""}${cfg.preview ? ", preview: " + JSON.stringify(cfg.preview) : ""}${cfg.sidebar ? ", sidebar: " + JSON.stringify(cfg.sidebar) : ""} };
 `;
     },
   };