From 2b1ed57cebef1388061cc74840d431bf087ec2e4 Mon Sep 17 00:00:00 2001
From: Rassl <rasul.sahibjanli@gmail.com>
Date: Thu, 25 Jun 2026 19:50:01 +0400
Subject: [PATCH] feat: standalone admin

---
 next.config.ts                                |   8 +
 src/app/admin/(console)/activity/page.tsx     |  12 +
 src/app/admin/(console)/appearance/page.tsx   |  12 +
 src/app/admin/(console)/audit/page.tsx        |  12 +
 src/app/admin/(console)/general/page.tsx      |  86 ++++
 src/app/admin/(console)/janitors/page.tsx     |  12 +
 src/app/admin/(console)/layout.tsx            | 145 +++++++
 src/app/admin/(console)/page.tsx              |  66 ++++
 src/app/admin/(console)/schedule/page.tsx     |  12 +
 src/app/{ => admin}/domains/domain-panel.tsx  |  80 ++--
 src/app/{ => admin}/domains/page.tsx          |  46 ++-
 src/app/admin/layout.tsx                      |  25 ++
 .../{ => admin}/ontology/edge-type-panel.tsx  |   2 +-
 src/app/{ => admin}/ontology/mock-large.ts    |   2 +-
 src/app/{ => admin}/ontology/mock-small.ts    |   2 +-
 .../ontology/ontology-graph-3d.tsx            |   2 +-
 .../{ => admin}/ontology/ontology-graph.tsx   |   2 +-
 src/app/{ => admin}/ontology/page.tsx         |  54 +--
 src/app/{ => admin}/ontology/type-editor.tsx  |   2 +-
 src/app/admin/reviews/page.tsx                |  11 +-
 src/app/settings/page.tsx                     | 245 ------------
 .../admin/activity-settings.tsx}              |   0
 .../admin}/appearance-settings.tsx            |   0
 src/components/admin/review-row.tsx           |   2 +-
 .../admin}/schema-audit.tsx                   |   0
 src/components/agent/message-list.tsx         |   2 +-
 src/components/feed/feed-card.tsx             |   2 +-
 src/components/layout/app-layout.tsx          |   2 +-
 src/components/layout/attachable-embeds.tsx   |   2 +-
 src/components/layout/connections-section.tsx |   2 +-
 src/components/layout/node-preview-panel.tsx  |   2 +-
 src/components/layout/node-row.tsx            |   2 +-
 src/components/layout/toolkit.tsx             |  14 +-
 src/components/modals/add-node-form.tsx       |   2 +-
 src/components/modals/domain-settings.tsx     | 327 ---------------
 src/components/modals/edit-node-modal.tsx     |   2 +-
 src/components/universe/graph-canvas.tsx      |   2 +-
 .../universe/hover-preview-card.tsx           |   2 +-
 src/lib/__tests__/admin-general-page.test.tsx |  83 ++++
 src/lib/__tests__/admin-guard.test.tsx        |  69 ++++
 src/lib/__tests__/domain-panel.test.tsx       |  30 +-
 src/lib/__tests__/edge-type-view.test.tsx     |   4 +-
 src/lib/__tests__/hover-preview-card.test.tsx |   2 +-
 src/lib/__tests__/node-display.test.ts        |   2 +-
 src/lib/__tests__/node-remap.test.ts          |   2 +-
 src/lib/__tests__/node-schema-utils.test.ts   |   2 +-
 src/lib/__tests__/schema-audit.test.tsx       |   2 +-
 src/lib/__tests__/settings-page.test.tsx      | 373 ------------------
 src/lib/__tests__/skin-system.test.tsx        |   6 +-
 src/lib/__tests__/toolkit-fab.test.tsx        |  18 +-
 src/lib/__tests__/type-editor.test.tsx        |   4 +-
 src/lib/node-display.ts                       |   2 +-
 src/lib/node-remap.ts                         |   2 +-
 src/lib/node-schema-utils.ts                  |   2 +-
 src/lib/schema-types.ts                       |  46 +++
 src/stores/schema-store.ts                    |   2 +-
 vitest.config.ts                              |   5 +-
 57 files changed, 760 insertions(+), 1099 deletions(-)
 create mode 100644 src/app/admin/(console)/activity/page.tsx
 create mode 100644 src/app/admin/(console)/appearance/page.tsx
 create mode 100644 src/app/admin/(console)/audit/page.tsx
 create mode 100644 src/app/admin/(console)/general/page.tsx
 create mode 100644 src/app/admin/(console)/janitors/page.tsx
 create mode 100644 src/app/admin/(console)/layout.tsx
 create mode 100644 src/app/admin/(console)/page.tsx
 create mode 100644 src/app/admin/(console)/schedule/page.tsx
 rename src/app/{ => admin}/domains/domain-panel.tsx (78%)
 rename src/app/{ => admin}/domains/page.tsx (92%)
 create mode 100644 src/app/admin/layout.tsx
 rename src/app/{ => admin}/ontology/edge-type-panel.tsx (98%)
 rename src/app/{ => admin}/ontology/mock-large.ts (99%)
 rename src/app/{ => admin}/ontology/mock-small.ts (99%)
 rename src/app/{ => admin}/ontology/ontology-graph-3d.tsx (99%)
 rename src/app/{ => admin}/ontology/ontology-graph.tsx (99%)
 rename src/app/{ => admin}/ontology/page.tsx (87%)
 rename src/app/{ => admin}/ontology/type-editor.tsx (99%)
 delete mode 100644 src/app/settings/page.tsx
 rename src/{app/settings/activity.tsx => components/admin/activity-settings.tsx} (100%)
 rename src/{app/settings => components/admin}/appearance-settings.tsx (100%)
 rename src/{app/settings => components/admin}/schema-audit.tsx (100%)
 delete mode 100644 src/components/modals/domain-settings.tsx
 create mode 100644 src/lib/__tests__/admin-general-page.test.tsx
 create mode 100644 src/lib/__tests__/admin-guard.test.tsx
 delete mode 100644 src/lib/__tests__/settings-page.test.tsx
 create mode 100644 src/lib/schema-types.ts

diff --git a/next.config.ts b/next.config.ts
index a2dd57ac..7a38b878 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -2,6 +2,14 @@ import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
   output: "standalone",
+  async redirects() {
+    // Admin surfaces were consolidated under /admin. Keep old bookmarks working.
+    return [
+      { source: "/settings", destination: "/admin", permanent: false },
+      { source: "/ontology", destination: "/admin/ontology", permanent: false },
+      { source: "/domains", destination: "/admin/domains", permanent: false },
+    ]
+  },
   async headers() {
     return [
       {
diff --git a/src/app/admin/(console)/activity/page.tsx b/src/app/admin/(console)/activity/page.tsx
new file mode 100644
index 00000000..2036291c
--- /dev/null
+++ b/src/app/admin/(console)/activity/page.tsx
@@ -0,0 +1,12 @@
+"use client"
+
+import dynamic from "next/dynamic"
+
+const ActivitySettings = dynamic(
+  () => import("@/components/admin/activity-settings").then((m) => m.ActivitySettings),
+  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
+)
+
+export default function ActivityPage() {
+  return <ActivitySettings open />
+}
diff --git a/src/app/admin/(console)/appearance/page.tsx b/src/app/admin/(console)/appearance/page.tsx
new file mode 100644
index 00000000..be2cfa21
--- /dev/null
+++ b/src/app/admin/(console)/appearance/page.tsx
@@ -0,0 +1,12 @@
+"use client"
+
+import dynamic from "next/dynamic"
+
+const AppearanceSettings = dynamic(
+  () => import("@/components/admin/appearance-settings").then((m) => m.AppearanceSettings),
+  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
+)
+
+export default function AppearancePage() {
+  return <AppearanceSettings open />
+}
diff --git a/src/app/admin/(console)/audit/page.tsx b/src/app/admin/(console)/audit/page.tsx
new file mode 100644
index 00000000..ccd150d8
--- /dev/null
+++ b/src/app/admin/(console)/audit/page.tsx
@@ -0,0 +1,12 @@
+"use client"
+
+import dynamic from "next/dynamic"
+
+const SchemaAuditSettings = dynamic(
+  () => import("@/components/admin/schema-audit").then((m) => m.SchemaAuditSettings),
+  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
+)
+
+export default function AuditPage() {
+  return <SchemaAuditSettings open />
+}
diff --git a/src/app/admin/(console)/general/page.tsx b/src/app/admin/(console)/general/page.tsx
new file mode 100644
index 00000000..65fceff6
--- /dev/null
+++ b/src/app/admin/(console)/general/page.tsx
@@ -0,0 +1,86 @@
+"use client"
+
+import { useCallback, useEffect, useState } from "react"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { MAX_LENGTHS } from "@/lib/input-limits"
+import { useAppStore } from "@/stores/app-store"
+import { api } from "@/lib/api"
+
+export default function GeneralSettingsPage() {
+  const { graphName, graphDescription, setGraphMeta } = useAppStore()
+
+  const [name, setName] = useState(graphName)
+  const [description, setDescription] = useState(graphDescription)
+  const [saving, setSaving] = useState(false)
+
+  // Sync local form state when global meta changes (e.g. after load)
+  useEffect(() => {
+    setName(graphName)
+    setDescription(graphDescription)
+  }, [graphName, graphDescription])
+
+  const handleSave = useCallback(async () => {
+    setSaving(true)
+    try {
+      await api.post("/about", { title: name, description })
+      setGraphMeta(name, description)
+    } catch (err) {
+      console.error("Failed to save settings:", err)
+    } finally {
+      setSaving(false)
+    }
+  }, [name, description, setGraphMeta])
+
+  const handleCancel = useCallback(() => {
+    setName(graphName)
+    setDescription(graphDescription)
+  }, [graphName, graphDescription])
+
+  return (
+    <div className="space-y-4">
+      <h2 className="text-lg font-heading font-semibold">General</h2>
+
+      <div className="space-y-2">
+        <Label htmlFor="graph-name" className="text-xs uppercase tracking-wider font-heading">
+          Graph Name
+        </Label>
+        <Input
+          id="graph-name"
+          value={name}
+          onChange={(e) => setName(e.target.value)}
+          maxLength={MAX_LENGTHS.GRAPH_NAME}
+          className="bg-muted/50 border-border/50 focus:border-primary/40"
+        />
+      </div>
+
+      <div className="space-y-2">
+        <Label htmlFor="graph-desc" className="text-xs uppercase tracking-wider font-heading">
+          Description
+        </Label>
+        <textarea
+          id="graph-desc"
+          value={description}
+          onChange={(e) => setDescription(e.target.value)}
+          rows={3}
+          maxLength={MAX_LENGTHS.GRAPH_DESCRIPTION}
+          className="w-full rounded-md border border-border/50 bg-muted/50 px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground focus:border-primary/40 focus:outline-none disabled:opacity-50 resize-none"
+        />
+      </div>
+
+      <div className="flex justify-end gap-2 pt-2">
+        <Button variant="ghost" onClick={handleCancel} className="text-xs">
+          Cancel
+        </Button>
+        <Button
+          onClick={handleSave}
+          disabled={saving}
+          className="text-xs bg-primary text-primary-foreground hover:bg-primary/90"
+        >
+          {saving ? "Saving..." : "Save Changes"}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/app/admin/(console)/janitors/page.tsx b/src/app/admin/(console)/janitors/page.tsx
new file mode 100644
index 00000000..b808385b
--- /dev/null
+++ b/src/app/admin/(console)/janitors/page.tsx
@@ -0,0 +1,12 @@
+"use client"
+
+import dynamic from "next/dynamic"
+
+const JanitorSettings = dynamic(
+  () => import("@/components/modals/janitor-settings").then((m) => m.JanitorSettings),
+  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
+)
+
+export default function JanitorsPage() {
+  return <JanitorSettings open />
+}
diff --git a/src/app/admin/(console)/layout.tsx b/src/app/admin/(console)/layout.tsx
new file mode 100644
index 00000000..ed8a6619
--- /dev/null
+++ b/src/app/admin/(console)/layout.tsx
@@ -0,0 +1,145 @@
+"use client"
+
+import { useEffect } from "react"
+import Link from "next/link"
+import { usePathname, useRouter } from "next/navigation"
+import {
+  ArrowLeft,
+  SlidersHorizontal,
+  Palette,
+  Network,
+  Boxes,
+  Stethoscope,
+  CalendarClock,
+  Wrench,
+  Activity,
+  ClipboardList,
+  type LucideIcon,
+} from "lucide-react"
+import { useReviewStore } from "@/stores/review-store"
+import { useUserStore } from "@/stores/user-store"
+import { listReviews } from "@/lib/graph-api"
+import { cn } from "@/lib/utils"
+
+interface NavItem {
+  label: string
+  href: string
+  icon: LucideIcon
+  /** Full-screen tools live outside the console shell. */
+  external?: boolean
+}
+
+interface NavGroup {
+  title: string
+  items: NavItem[]
+}
+
+const NAV_GROUPS: NavGroup[] = [
+  {
+    title: "Graph",
+    items: [
+      { label: "General", href: "/admin/general", icon: SlidersHorizontal },
+      { label: "Appearance", href: "/admin/appearance", icon: Palette },
+    ],
+  },
+  {
+    title: "Schema",
+    items: [
+      { label: "Ontology", href: "/admin/ontology", icon: Network, external: true },
+      { label: "Domains", href: "/admin/domains", icon: Boxes, external: true },
+      { label: "Audit", href: "/admin/audit", icon: Stethoscope },
+    ],
+  },
+  {
+    title: "Automation",
+    items: [
+      { label: "Schedule", href: "/admin/schedule", icon: CalendarClock },
+      { label: "Janitors", href: "/admin/janitors", icon: Wrench },
+      { label: "Activity", href: "/admin/activity", icon: Activity },
+    ],
+  },
+  {
+    title: "Moderation",
+    items: [
+      { label: "Reviews", href: "/admin/reviews", icon: ClipboardList, external: true },
+    ],
+  },
+]
+
+export default function ConsoleLayout({ children }: { children: React.ReactNode }) {
+  const router = useRouter()
+  const pathname = usePathname()
+  const isAdmin = useUserStore((s) => s.isAdmin)
+  const { pendingCount, setPendingCount } = useReviewStore()
+
+  // Keep the Reviews badge fresh (same pattern as the toolkit).
+  useEffect(() => {
+    if (!isAdmin) return
+    let cancelled = false
+    listReviews({ status: "pending", limit: 1 })
+      .then((res) => { if (!cancelled) setPendingCount(res.total) })
+      .catch(() => {})
+    return () => { cancelled = true }
+  }, [isAdmin, setPendingCount])
+
+  return (
+    <div className="flex h-screen bg-background text-foreground overflow-hidden">
+      {/* Sidebar */}
+      <aside className="flex w-56 shrink-0 flex-col border-r border-border bg-background/60">
+        <div className="flex items-center gap-2 border-b border-border px-4 py-3">
+          <button
+            type="button"
+            aria-label="Back to graph"
+            onClick={() => router.push("/")}
+            className="flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-muted/40 hover:text-foreground"
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </button>
+          <h1 className="text-sm font-heading font-semibold tracking-wide uppercase">
+            Admin
+          </h1>
+        </div>
+
+        <nav className="flex-1 overflow-y-auto px-2 py-3">
+          {NAV_GROUPS.map((group) => (
+            <div key={group.title} className="mb-4">
+              <p className="px-2 pb-1 text-[10px] font-heading uppercase tracking-wider text-muted-foreground/70">
+                {group.title}
+              </p>
+              {group.items.map((item) => {
+                const active = pathname === item.href
+                const Icon = item.icon
+                const badge = item.href === "/admin/reviews" ? pendingCount : 0
+                return (
+                  <Link
+                    key={item.href}
+                    href={item.href}
+                    className={cn(
+                      "group flex items-center gap-2.5 rounded-md px-2 py-1.5 text-sm transition-colors",
+                      active
+                        ? "bg-primary/10 text-primary"
+                        : "text-muted-foreground hover:bg-muted/40 hover:text-foreground"
+                    )}
+                  >
+                    <Icon className="h-4 w-4 shrink-0" />
+                    <span className="flex-1 truncate">{item.label}</span>
+                    {badge > 0 && (
+                      <span className="flex h-4 min-w-4 items-center justify-center rounded-full bg-primary px-1 text-[9px] font-bold text-primary-foreground">
+                        {badge > 99 ? "99+" : badge}
+                      </span>
+                    )}
+                  </Link>
+                )
+              })}
+            </div>
+          ))}
+        </nav>
+      </aside>
+
+      {/* Content */}
+      <main className="flex-1 overflow-auto">
+        <div className="mx-auto max-w-2xl px-6 py-8">{children}</div>
+      </main>
+    </div>
+  )
+}
diff --git a/src/app/admin/(console)/page.tsx b/src/app/admin/(console)/page.tsx
new file mode 100644
index 00000000..535b0732
--- /dev/null
+++ b/src/app/admin/(console)/page.tsx
@@ -0,0 +1,66 @@
+"use client"
+
+import Link from "next/link"
+import {
+  SlidersHorizontal,
+  Palette,
+  Network,
+  Boxes,
+  Stethoscope,
+  CalendarClock,
+  Wrench,
+  Activity,
+  ClipboardList,
+  type LucideIcon,
+} from "lucide-react"
+
+interface Card {
+  label: string
+  href: string
+  icon: LucideIcon
+  description: string
+}
+
+const CARDS: Card[] = [
+  { label: "General", href: "/admin/general", icon: SlidersHorizontal, description: "Graph name and description" },
+  { label: "Appearance", href: "/admin/appearance", icon: Palette, description: "UI skin / theme" },
+  { label: "Ontology", href: "/admin/ontology", icon: Network, description: "Edit schema types and edges" },
+  { label: "Domains", href: "/admin/domains", icon: Boxes, description: "Organize and hide domains and types" },
+  { label: "Audit", href: "/admin/audit", icon: Stethoscope, description: "Schema health diagnostics" },
+  { label: "Schedule", href: "/admin/schedule", icon: CalendarClock, description: "Source polling cadence" },
+  { label: "Janitors", href: "/admin/janitors", icon: Wrench, description: "Automated graph maintenance" },
+  { label: "Activity", href: "/admin/activity", icon: Activity, description: "Recent runs and source activity" },
+  { label: "Reviews", href: "/admin/reviews", icon: ClipboardList, description: "Moderation queue" },
+]
+
+export default function AdminOverviewPage() {
+  return (
+    <div className="space-y-6">
+      <div>
+        <h2 className="text-lg font-heading font-semibold">Admin Console</h2>
+        <p className="text-sm text-muted-foreground">
+          Manage the graph, its schema, automation, and moderation.
+        </p>
+      </div>
+
+      <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+        {CARDS.map((card) => {
+          const Icon = card.icon
+          return (
+            <Link
+              key={card.href}
+              href={card.href}
+              className="group flex items-start gap-3 rounded-lg border border-border/60 bg-muted/20 p-4 transition-colors hover:border-primary/40 hover:bg-muted/40"
+            >
+              <Icon className="mt-0.5 h-5 w-5 shrink-0 text-muted-foreground group-hover:text-primary" />
+              <div className="min-w-0">
+                <p className="text-sm font-medium">{card.label}</p>
+                <p className="text-xs text-muted-foreground">{card.description}</p>
+              </div>
+            </Link>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
diff --git a/src/app/admin/(console)/schedule/page.tsx b/src/app/admin/(console)/schedule/page.tsx
new file mode 100644
index 00000000..10aa424e
--- /dev/null
+++ b/src/app/admin/(console)/schedule/page.tsx
@@ -0,0 +1,12 @@
+"use client"
+
+import dynamic from "next/dynamic"
+
+const RadarSettings = dynamic(
+  () => import("@/components/modals/radar-settings").then((m) => m.RadarSettings),
+  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
+)
+
+export default function SchedulePage() {
+  return <RadarSettings open />
+}
diff --git a/src/app/domains/domain-panel.tsx b/src/app/admin/domains/domain-panel.tsx
similarity index 78%
rename from src/app/domains/domain-panel.tsx
rename to src/app/admin/domains/domain-panel.tsx
index e4fef56f..9c13a150 100644
--- a/src/app/domains/domain-panel.tsx
+++ b/src/app/admin/domains/domain-panel.tsx
@@ -9,7 +9,8 @@ import { Switch } from "@/components/ui/switch"
 import { Separator } from "@/components/ui/separator"
 import { MultiSelectCustom } from "@/components/ui/multi-select-custom"
 import { MAX_LENGTHS } from "@/lib/input-limits"
-import type { SchemaNode } from "@/app/ontology/page"
+import { cn } from "@/lib/utils"
+import type { SchemaNode } from "@/lib/schema-types"
 
 export interface DomainRow {
   /** Lowercased domain identifier (the canonical key). */
@@ -29,6 +30,9 @@ interface DomainPanelProps {
   onAddTypes: (typeNames: string[]) => void
   onRemoveType: (typeName: string) => void
   onToggleHidden: (hidden: boolean) => void
+  /** Node types currently hidden from search (hidden_types). */
+  hiddenTypes: Set<string>
+  onToggleTypeHidden: (typeName: string, hidden: boolean) => void
   onDelete: () => void
   onClose: () => void
   busy?: boolean
@@ -48,6 +52,8 @@ export function DomainPanel({
   onAddTypes,
   onRemoveType,
   onToggleHidden,
+  hiddenTypes,
+  onToggleTypeHidden,
   onDelete,
   onClose,
   busy,
@@ -181,7 +187,7 @@ export function DomainPanel({
             ) : (
               <Eye className="h-3.5 w-3.5 text-muted-foreground" />
             )}
-            <span className="text-xs text-foreground">Hidden from search</span>
+            <span className="text-xs text-foreground">Hide entire domain from search</span>
           </div>
           <Switch
             checked={domain.hidden}
@@ -210,33 +216,53 @@ export function DomainPanel({
             </p>
           ) : (
             <div className="rounded-md border border-border/40 divide-y divide-border/30 max-h-56 overflow-y-auto">
-              {domain.members.map((m) => (
-                <div
-                  key={m.ref_id || m.type}
-                  className="flex items-center gap-2 px-3 py-2"
-                >
+              {domain.members.map((m) => {
+                const typeHidden = hiddenTypes.has(m.type)
+                return (
                   <div
-                    className="h-2.5 w-2.5 rounded-full shrink-0"
-                    style={{ backgroundColor: m.color }}
-                  />
-                  <div className="min-w-0 flex-1">
-                    <p className="text-xs text-foreground truncate">{m.type}</p>
-                    {m.parent && (
-                      <p className="text-[10px] font-mono text-muted-foreground/70 truncate">
-                        ↳ {m.parent}
-                      </p>
-                    )}
-                  </div>
-                  <button
-                    onClick={() => onRemoveType(m.type)}
-                    disabled={busy}
-                    title="Remove from domain (moves to entity)"
-                    className="text-muted-foreground/40 hover:text-destructive transition-colors shrink-0 disabled:opacity-40"
+                    key={m.ref_id || m.type}
+                    className="flex items-center gap-2 px-3 py-2"
                   >
-                    <X className="h-3.5 w-3.5" />
-                  </button>
-                </div>
-              ))}
+                    <div
+                      className="h-2.5 w-2.5 rounded-full shrink-0"
+                      style={{ backgroundColor: m.color }}
+                    />
+                    <div className="min-w-0 flex-1">
+                      <p className="text-xs text-foreground truncate">{m.type}</p>
+                      {m.parent && (
+                        <p className="text-[10px] font-mono text-muted-foreground/70 truncate">
+                          ↳ {m.parent}
+                        </p>
+                      )}
+                    </div>
+                    <button
+                      onClick={() => onToggleTypeHidden(m.type, !typeHidden)}
+                      disabled={busy}
+                      title={typeHidden ? "Show type in search" : "Hide type from search"}
+                      className={cn(
+                        "shrink-0 transition-colors disabled:opacity-40",
+                        typeHidden
+                          ? "text-amber-300/90 hover:text-amber-300"
+                          : "text-muted-foreground/40 hover:text-foreground"
+                      )}
+                    >
+                      {typeHidden ? (
+                        <EyeOff className="h-3.5 w-3.5" />
+                      ) : (
+                        <Eye className="h-3.5 w-3.5" />
+                      )}
+                    </button>
+                    <button
+                      onClick={() => onRemoveType(m.type)}
+                      disabled={busy}
+                      title="Remove from domain (moves to entity)"
+                      className="text-muted-foreground/40 hover:text-destructive transition-colors shrink-0 disabled:opacity-40"
+                    >
+                      <X className="h-3.5 w-3.5" />
+                    </button>
+                  </div>
+                )
+              })}
             </div>
           )}
 
diff --git a/src/app/domains/page.tsx b/src/app/admin/domains/page.tsx
similarity index 92%
rename from src/app/domains/page.tsx
rename to src/app/admin/domains/page.tsx
index 09fcd40f..90f8b9d1 100644
--- a/src/app/domains/page.tsx
+++ b/src/app/admin/domains/page.tsx
@@ -8,12 +8,11 @@ import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { MultiSelectCustom } from "@/components/ui/multi-select-custom"
 import { DomainPanel, type DomainRow } from "./domain-panel"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { useSchemaStore } from "@/stores/schema-store"
-import { useUserStore } from "@/stores/user-store"
 import { useAppStore } from "@/stores/app-store"
 import { isMocksEnabled, MOCK_DOMAINS } from "@/lib/mock-data"
-import { SMALL_SCHEMAS, SMALL_EDGES } from "@/app/ontology/mock-small"
+import { SMALL_SCHEMAS, SMALL_EDGES } from "@/app/admin/ontology/mock-small"
 import {
   getSchemaDomains,
   updateHiddenLists,
@@ -35,8 +34,6 @@ function capitalize(s: string): string {
 
 export default function DomainsPage() {
   const router = useRouter()
-  const isAdmin = useUserStore((s) => s.isAdmin)
-  const isAuthenticated = useUserStore((s) => s.isAuthenticated)
   const store = useSchemaStore()
   const { graphName, graphDescription } = useAppStore()
 
@@ -52,10 +49,6 @@ export default function DomainsPage() {
   const [createName, setCreateName] = useState("")
   const [createTypes, setCreateTypes] = useState<string[]>([])
 
-  useEffect(() => {
-    if (isAuthenticated && !isAdmin) router.replace("/")
-  }, [isAdmin, isAuthenticated, router])
-
   const reloadDomains = useCallback(async () => {
     setLoadingDomains(true)
     try {
@@ -199,6 +192,35 @@ export default function DomainsPage() {
     [domainsInfo, graphName, graphDescription]
   )
 
+  // Per-type visibility (hidden_types). Mirrors handleToggleHidden but operates
+  // on individual node types rather than whole domains.
+  const handleToggleTypeHidden = useCallback(
+    async (typeName: string, hidden: boolean) => {
+      const current = new Set(domainsInfo?.hidden_types ?? [])
+      if (hidden) current.add(typeName)
+      else current.delete(typeName)
+      const next = Array.from(current).sort()
+      setBusy(true)
+      setError(null)
+      try {
+        if (!isMocksEnabled()) {
+          await updateHiddenLists(graphName, graphDescription, next, undefined)
+        }
+        setDomainsInfo((prev) => (prev ? { ...prev, hidden_types: next } : prev))
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Failed to update visibility")
+      } finally {
+        setBusy(false)
+      }
+    },
+    [domainsInfo, graphName, graphDescription]
+  )
+
+  const hiddenTypes = useMemo(
+    () => new Set(domainsInfo?.hidden_types ?? []),
+    [domainsInfo]
+  )
+
   const handleDelete = useCallback(
     async (row: DomainRow) => {
       // Empty domains are derived away on reload; just clean up a stale hidden entry.
@@ -241,8 +263,6 @@ export default function DomainsPage() {
     [store.schemas]
   )
 
-  if (isAuthenticated && !isAdmin) return null
-
   const loading = loadingDomains && store.loading
 
   return (
@@ -253,7 +273,7 @@ export default function DomainsPage() {
           <Button
             size="sm"
             variant="ghost"
-            onClick={() => router.push("/")}
+            onClick={() => router.push("/admin")}
             className="h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
           >
             <ArrowLeft className="h-4 w-4" />
@@ -389,6 +409,8 @@ export default function DomainsPage() {
               onAddTypes={(types) => handleAddTypes(selectedRow, types)}
               onRemoveType={handleRemoveType}
               onToggleHidden={(hidden) => handleToggleHidden(selectedRow, hidden)}
+              hiddenTypes={hiddenTypes}
+              onToggleTypeHidden={handleToggleTypeHidden}
               onDelete={() => handleDelete(selectedRow)}
               onClose={() => setSelectedKey(null)}
               busy={busy}
diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
new file mode 100644
index 00000000..872b82a5
--- /dev/null
+++ b/src/app/admin/layout.tsx
@@ -0,0 +1,25 @@
+"use client"
+
+import { useEffect } from "react"
+import { useRouter } from "next/navigation"
+import { useUserStore } from "@/stores/user-store"
+
+/**
+ * Single admin guard for the whole `/admin/*` console. Replaces the per-page
+ * redirects that previously lived in settings/ontology/domains/reviews. Auth
+ * itself is established at the app root by AuthGuard; here we only gate on the
+ * resolved isAdmin flag.
+ */
+export default function AdminLayout({ children }: { children: React.ReactNode }) {
+  const router = useRouter()
+  const isAuthenticated = useUserStore((s) => s.isAuthenticated)
+  const isAdmin = useUserStore((s) => s.isAdmin)
+
+  useEffect(() => {
+    if (isAuthenticated && !isAdmin) router.replace("/")
+  }, [isAdmin, isAuthenticated, router])
+
+  if (isAuthenticated && !isAdmin) return null
+
+  return <>{children}</>
+}
diff --git a/src/app/ontology/edge-type-panel.tsx b/src/app/admin/ontology/edge-type-panel.tsx
similarity index 98%
rename from src/app/ontology/edge-type-panel.tsx
rename to src/app/admin/ontology/edge-type-panel.tsx
index 139fd176..2fe2810a 100644
--- a/src/app/ontology/edge-type-panel.tsx
+++ b/src/app/admin/ontology/edge-type-panel.tsx
@@ -4,7 +4,7 @@ import { X, GitMerge } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { Separator } from "@/components/ui/separator"
 import { Label } from "@/components/ui/label"
-import type { SchemaEdge, SchemaNode } from "./page"
+import type { SchemaEdge, SchemaNode } from "@/lib/schema-types"
 
 interface Props {
   edgeType: string
diff --git a/src/app/ontology/mock-large.ts b/src/app/admin/ontology/mock-large.ts
similarity index 99%
rename from src/app/ontology/mock-large.ts
rename to src/app/admin/ontology/mock-large.ts
index e5384b8b..f2622999 100644
--- a/src/app/ontology/mock-large.ts
+++ b/src/app/admin/ontology/mock-large.ts
@@ -1,4 +1,4 @@
-import type { SchemaNode, SchemaEdge } from "./page"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 
 const COLORS = [
   "#6366f1", "#0d9488", "#d97706", "#8b5cf6", "#ef4444",
diff --git a/src/app/ontology/mock-small.ts b/src/app/admin/ontology/mock-small.ts
similarity index 99%
rename from src/app/ontology/mock-small.ts
rename to src/app/admin/ontology/mock-small.ts
index 759da6cd..dafc7f15 100644
--- a/src/app/ontology/mock-small.ts
+++ b/src/app/admin/ontology/mock-small.ts
@@ -1,4 +1,4 @@
-import type { SchemaNode, SchemaEdge } from "./page"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 
 // Trimmed from real /schema/all response
 export const SMALL_SCHEMAS: SchemaNode[] = [
diff --git a/src/app/ontology/ontology-graph-3d.tsx b/src/app/admin/ontology/ontology-graph-3d.tsx
similarity index 99%
rename from src/app/ontology/ontology-graph-3d.tsx
rename to src/app/admin/ontology/ontology-graph-3d.tsx
index 3a9f6f78..941f8cba 100644
--- a/src/app/ontology/ontology-graph-3d.tsx
+++ b/src/app/admin/ontology/ontology-graph-3d.tsx
@@ -16,7 +16,7 @@ import {
   PrevNodeIndicator,
 } from "@/graph-viz-kit"
 import type { Graph, ViewState, RawNode, RawEdge } from "@/graph-viz-kit"
-import type { SchemaNode, SchemaEdge } from "./page"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 
 interface Props {
   schemas: SchemaNode[]
diff --git a/src/app/ontology/ontology-graph.tsx b/src/app/admin/ontology/ontology-graph.tsx
similarity index 99%
rename from src/app/ontology/ontology-graph.tsx
rename to src/app/admin/ontology/ontology-graph.tsx
index e3b32bbe..4a9ea1c7 100644
--- a/src/app/ontology/ontology-graph.tsx
+++ b/src/app/admin/ontology/ontology-graph.tsx
@@ -7,7 +7,7 @@ import { select as d3Select } from "d3-selection"
 import "d3-transition"
 import { ZoomIn, ZoomOut, Maximize2 } from "lucide-react"
 import { Button } from "@/components/ui/button"
-import type { SchemaNode, SchemaEdge } from "./page"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 
 const NODE_WIDTH = 160
 const NODE_HEIGHT = 56
diff --git a/src/app/ontology/page.tsx b/src/app/admin/ontology/page.tsx
similarity index 87%
rename from src/app/ontology/page.tsx
rename to src/app/admin/ontology/page.tsx
index 987911c1..19c62cfc 100644
--- a/src/app/ontology/page.tsx
+++ b/src/app/admin/ontology/page.tsx
@@ -18,54 +18,11 @@ import { Input } from "@/components/ui/input"
 import { useSchemaStore } from "@/stores/schema-store"
 import { isMocksEnabled } from "@/lib/mock-data"
 import { SMALL_SCHEMAS, SMALL_EDGES } from "./mock-small"
-
-export interface SchemaAttribute {
-  key: string
-  type: string
-  required: boolean
-}
-
-export interface SchemaNode {
-  ref_id: string
-  type: string
-  parent: string
-  color: string
-  node_key: string
-  // The search domain this schema belongs to (lowercased). Domains are derived
-  // backend-side from `DISTINCT toLower(s.domain)`; a root type only registers as
-  // its own domain when this is set to its name. Omitted → backend defaults to
-  // "entity". Set explicitly by the Domains editor; left unset by the ontology editor.
-  domain?: string
-  attributes: SchemaAttribute[]
-  inherited_attributes?: SchemaAttribute[]
-  title_key?: string
-  index?: string
-  description_key?: string
-  icon?: string
-  secondary_color?: string
-  paid_properties?: string[]
-}
-
-export interface SchemaEdge {
-  ref_id: string
-  // `source`/`target` are the connected schema NODES' ref_ids (used to lay out
-  // the ontology graph), NOT type names. Use `source_type`/`target_type` to
-  // match against a node's node_type.
-  source: string
-  target: string
-  edge_type: string
-  source_type?: string
-  target_type?: string
-  // Attribute definitions for this edge type, e.g. { since: "?datetime",
-  // role: "string" }. A leading "?" marks the attribute optional. Present on
-  // the live /schema/all payload; absent on some mock fixtures.
-  attributes?: Record<string, string>
-}
+import type { SchemaNode } from "@/lib/schema-types"
 
 export default function OntologyPage() {
   const router = useRouter()
   const isAdmin = useUserStore((s) => s.isAdmin)
-  const isAuthenticated = useUserStore((s) => s.isAuthenticated)
   const store = useSchemaStore()
   const [selectedId, setSelectedId] = useState<string | null>(null)
   const [view3D, setView3D] = useState(false)
@@ -75,13 +32,6 @@ export default function OntologyPage() {
   const [selectedEdgeType, setSelectedEdgeType] = useState<string | null>(null)
   const [edgeSearch, setEdgeSearch] = useState("")
 
-  useEffect(() => {
-    if (isAuthenticated && !isAdmin) {
-      router.replace("/")
-      return
-    }
-  }, [isAdmin, isAuthenticated, router])
-
   useEffect(() => {
     if (isMocksEnabled()) {
       store.setSchemas(SMALL_SCHEMAS)
@@ -188,7 +138,7 @@ export default function OntologyPage() {
           <Button
             size="sm"
             variant="ghost"
-            onClick={() => router.push("/")}
+            onClick={() => router.push("/admin")}
             className="h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
           >
             <ArrowLeft className="h-4 w-4" />
diff --git a/src/app/ontology/type-editor.tsx b/src/app/admin/ontology/type-editor.tsx
similarity index 99%
rename from src/app/ontology/type-editor.tsx
rename to src/app/admin/ontology/type-editor.tsx
index f494c355..c7934155 100644
--- a/src/app/ontology/type-editor.tsx
+++ b/src/app/admin/ontology/type-editor.tsx
@@ -10,7 +10,7 @@ import { Separator } from "@/components/ui/separator"
 import { SelectCustom } from "@/components/ui/select-custom"
 import { MultiSelectCustom } from "@/components/ui/multi-select-custom"
 import { MAX_LENGTHS } from "@/lib/input-limits"
-import type { SchemaNode, SchemaAttribute, SchemaEdge } from "./page"
+import type { SchemaNode, SchemaAttribute, SchemaEdge } from "@/lib/schema-types"
 
 const COLORS = [
   "#6366f1", "#0d9488", "#d97706", "#8b5cf6", "#ef4444",
diff --git a/src/app/admin/reviews/page.tsx b/src/app/admin/reviews/page.tsx
index dfe2a7fa..351efe90 100644
--- a/src/app/admin/reviews/page.tsx
+++ b/src/app/admin/reviews/page.tsx
@@ -6,7 +6,6 @@ import { ArrowLeft, ArrowRightLeft, GitMerge, Layers, Network, Pencil, PlusSquar
 import { useDebounce } from "@/hooks/use-debounce"
 import { Input } from "@/components/ui/input"
 import type { LucideIcon } from "lucide-react"
-import { useUserStore } from "@/stores/user-store"
 import { useReviewStore } from "@/stores/review-store"
 import { useSchemaStore } from "@/stores/schema-store"
 import { approveReview, dismissReview, listReviews } from "@/lib/graph-api"
@@ -67,7 +66,6 @@ function SkeletonRows() {
 
 export default function ReviewsPage() {
   const router = useRouter()
-  const { isAdmin } = useUserStore()
   const { setPendingCount } = useReviewStore()
   const schemas = useSchemaStore((s) => s.schemas)
 
@@ -90,11 +88,6 @@ export default function ReviewsPage() {
 
   const abortRef = useRef<AbortController | null>(null)
 
-  // Redirect non-admins
-  useEffect(() => {
-    if (!isAdmin) router.replace("/")
-  }, [isAdmin, router])
-
   const fetchReviews = useCallback(
     async (currentSkip = 0, options?: { silent?: boolean }) => {
       if (abortRef.current) abortRef.current.abort()
@@ -231,8 +224,6 @@ export default function ReviewsPage() {
   const totalPages = Math.ceil(total / PAGE_SIZE)
   const currentPage = Math.floor(skip / PAGE_SIZE) + 1
 
-  if (!isAdmin) return null
-
   return (
     <div className="flex h-full flex-col bg-background text-foreground overflow-hidden">
       {/* Title row */}
@@ -240,7 +231,7 @@ export default function ReviewsPage() {
         <Button
           size="sm"
           variant="ghost"
-          onClick={() => router.push("/")}
+          onClick={() => router.push("/admin")}
           className="h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
         >
           <ArrowLeft className="h-4 w-4" />
diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx
deleted file mode 100644
index f276cc08..00000000
--- a/src/app/settings/page.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-"use client"
-
-import { Suspense, useCallback, useEffect, useState } from "react"
-import dynamic from "next/dynamic"
-import { useRouter, useSearchParams } from "next/navigation"
-import { ArrowLeft } from "lucide-react"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
-import { MAX_LENGTHS } from "@/lib/input-limits"
-import { useAppStore } from "@/stores/app-store"
-import { useUserStore } from "@/stores/user-store"
-import { api } from "@/lib/api"
-
-const RadarSettings = dynamic(
-  () => import("@/components/modals/radar-settings").then((m) => m.RadarSettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const JanitorSettings = dynamic(
-  () => import("@/components/modals/janitor-settings").then((m) => m.JanitorSettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const DomainSettings = dynamic(
-  () => import("@/components/modals/domain-settings").then((m) => m.DomainSettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const SchemaAuditSettings = dynamic(
-  () => import("@/app/settings/schema-audit").then((m) => m.SchemaAuditSettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const ActivitySettings = dynamic(
-  () => import("@/app/settings/activity").then((m) => m.ActivitySettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const AppearanceSettings = dynamic(
-  () => import("@/app/settings/appearance-settings").then((m) => m.AppearanceSettings),
-  { ssr: false, loading: () => <p className="text-sm text-muted-foreground">Loading…</p> }
-)
-
-const VALID_TABS = ["general", "radar", "janitor", "activity", "domains", "audit", "appearance"] as const
-const ADMIN_ONLY_TABS = ["radar", "janitor", "activity", "domains", "audit", "appearance"] as const
-type TabId = (typeof VALID_TABS)[number]
-
-function resolveTab(raw: string | null, isAdmin: boolean): TabId {
-  if (!raw) return "general"
-  if (!(VALID_TABS as readonly string[]).includes(raw)) return "general"
-  if ((ADMIN_ONLY_TABS as readonly string[]).includes(raw) && !isAdmin) return "general"
-  return raw as TabId
-}
-
-function SettingsContent() {
-  const router = useRouter()
-  const searchParams = useSearchParams()
-  const isAuthenticated = useUserStore((s) => s.isAuthenticated)
-  const isAdmin = useUserStore((s) => s.isAdmin)
-  const { graphName, graphDescription, setGraphMeta } = useAppStore()
-
-  const [name, setName] = useState(graphName)
-  const [description, setDescription] = useState(graphDescription)
-  const [saving, setSaving] = useState(false)
-
-  const activeTab = resolveTab(searchParams.get("tab"), isAdmin)
-
-  // Sync local form state when global meta changes (e.g. after load)
-  useEffect(() => {
-    setName(graphName)
-    setDescription(graphDescription)
-  }, [graphName, graphDescription])
-
-  // Admin guard
-  useEffect(() => {
-    if (isAuthenticated && !isAdmin) {
-      router.replace("/")
-    }
-  }, [isAdmin, isAuthenticated, router])
-
-  const handleTabChange = useCallback(
-    (tab: string) => {
-      router.replace(`/settings?tab=${tab}`)
-    },
-    [router]
-  )
-
-  const handleSave = useCallback(async () => {
-    if (!isAdmin) return
-    setSaving(true)
-    try {
-      await api.post("/about", { title: name, description })
-      setGraphMeta(name, description)
-    } catch (err) {
-      console.error("Failed to save settings:", err)
-    } finally {
-      setSaving(false)
-    }
-  }, [name, description, isAdmin, setGraphMeta])
-
-  const handleCancel = useCallback(() => {
-    setName(graphName)
-    setDescription(graphDescription)
-  }, [graphName, graphDescription])
-
-  if (isAuthenticated && !isAdmin) return null
-
-  return (
-    <div className="flex h-screen flex-col bg-background text-foreground overflow-hidden">
-      {/* Header */}
-      <div className="flex shrink-0 items-center gap-3 border-b border-border px-4 py-2.5">
-        <Button
-          size="sm"
-          variant="ghost"
-          onClick={() => router.push("/")}
-          className="h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
-        >
-          <ArrowLeft className="h-4 w-4" />
-        </Button>
-        <h1 className="text-sm font-heading font-semibold tracking-wide uppercase">
-          Graph Settings
-        </h1>
-      </div>
-
-      {/* Content */}
-      <div className="flex-1 overflow-auto">
-        <div className="mx-auto max-w-2xl px-4 py-6">
-          <Tabs value={activeTab} onValueChange={handleTabChange}>
-            <TabsList className="w-full">
-              <TabsTrigger value="general">General</TabsTrigger>
-              {isAdmin && <TabsTrigger value="radar">Schedule</TabsTrigger>}
-              {isAdmin && <TabsTrigger value="janitor">Janitors</TabsTrigger>}
-              {isAdmin && <TabsTrigger value="activity">Activity</TabsTrigger>}
-              {isAdmin && <TabsTrigger value="domains">Domains</TabsTrigger>}
-              {isAdmin && <TabsTrigger value="audit">Audit</TabsTrigger>}
-              {isAdmin && <TabsTrigger value="appearance">Appearance</TabsTrigger>}
-            </TabsList>
-
-            <TabsContent value="general" className="space-y-4 pt-4">
-              <div className="space-y-2">
-                <Label
-                  htmlFor="graph-name"
-                  className="text-xs uppercase tracking-wider font-heading"
-                >
-                  Graph Name
-                </Label>
-                <Input
-                  id="graph-name"
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  disabled={!isAdmin}
-                  maxLength={MAX_LENGTHS.GRAPH_NAME}
-                  className="bg-muted/50 border-border/50 focus:border-primary/40"
-                />
-              </div>
-
-              <div className="space-y-2">
-                <Label
-                  htmlFor="graph-desc"
-                  className="text-xs uppercase tracking-wider font-heading"
-                >
-                  Description
-                </Label>
-                <textarea
-                  id="graph-desc"
-                  value={description}
-                  onChange={(e) => setDescription(e.target.value)}
-                  disabled={!isAdmin}
-                  rows={3}
-                  maxLength={MAX_LENGTHS.GRAPH_DESCRIPTION}
-                  className="w-full rounded-md border border-border/50 bg-muted/50 px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground focus:border-primary/40 focus:outline-none disabled:opacity-50 resize-none"
-                />
-              </div>
-
-              {isAdmin && (
-                <div className="flex justify-end gap-2 pt-2">
-                  <Button variant="ghost" onClick={handleCancel} className="text-xs">
-                    Cancel
-                  </Button>
-                  <Button
-                    onClick={handleSave}
-                    disabled={saving}
-                    className="text-xs bg-primary text-primary-foreground hover:bg-primary/90"
-                  >
-                    {saving ? "Saving..." : "Save Changes"}
-                  </Button>
-                </div>
-              )}
-            </TabsContent>
-
-            {isAdmin && (
-              <TabsContent value="radar" className="pt-4">
-                <RadarSettings open={activeTab === "radar"} />
-              </TabsContent>
-            )}
-
-            {isAdmin && (
-              <TabsContent value="janitor" className="pt-4">
-                <JanitorSettings open={activeTab === "janitor"} />
-              </TabsContent>
-            )}
-
-            {isAdmin && (
-              <TabsContent value="activity" className="pt-4">
-                <ActivitySettings open={activeTab === "activity"} />
-              </TabsContent>
-            )}
-
-            {isAdmin && (
-              <TabsContent value="domains" className="pt-4">
-                <DomainSettings
-                  open={activeTab === "domains"}
-                  title={name}
-                  description={description}
-                />
-              </TabsContent>
-            )}
-
-            {isAdmin && (
-              <TabsContent value="audit" className="pt-4">
-                <SchemaAuditSettings open={activeTab === "audit"} />
-              </TabsContent>
-            )}
-
-            {isAdmin && (
-              <TabsContent value="appearance" className="pt-4">
-                <AppearanceSettings open={activeTab === "appearance"} />
-              </TabsContent>
-            )}
-          </Tabs>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default function SettingsPage() {
-  return (
-    <Suspense>
-      <SettingsContent />
-    </Suspense>
-  )
-}
diff --git a/src/app/settings/activity.tsx b/src/components/admin/activity-settings.tsx
similarity index 100%
rename from src/app/settings/activity.tsx
rename to src/components/admin/activity-settings.tsx
diff --git a/src/app/settings/appearance-settings.tsx b/src/components/admin/appearance-settings.tsx
similarity index 100%
rename from src/app/settings/appearance-settings.tsx
rename to src/components/admin/appearance-settings.tsx
diff --git a/src/components/admin/review-row.tsx b/src/components/admin/review-row.tsx
index db54ba40..6c341d35 100644
--- a/src/components/admin/review-row.tsx
+++ b/src/components/admin/review-row.tsx
@@ -15,7 +15,7 @@ import {
 } from "@/components/ui/tooltip"
 import { NodeRow } from "@/components/layout/node-row"
 import { Checkbox } from "@/components/ui/checkbox"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { DISPLAY_KEY_FALLBACKS, pickString } from "@/lib/node-display"
 import { useUserStore } from "@/stores/user-store"
 import { useGraphStore } from "@/stores/graph-store"
diff --git a/src/app/settings/schema-audit.tsx b/src/components/admin/schema-audit.tsx
similarity index 100%
rename from src/app/settings/schema-audit.tsx
rename to src/components/admin/schema-audit.tsx
diff --git a/src/components/agent/message-list.tsx b/src/components/agent/message-list.tsx
index 7ca04483..a5aaee87 100644
--- a/src/components/agent/message-list.tsx
+++ b/src/components/agent/message-list.tsx
@@ -12,7 +12,7 @@ import { cn } from "@/lib/utils"
 import { Skeleton } from "@/components/ui/skeleton"
 import type { AgentMessage } from "@/lib/agent-api"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 // Basic markdown renderer — bold, italic, inline code, line breaks, headings
 function MarkdownText({ text }: { text: string }) {
diff --git a/src/components/feed/feed-card.tsx b/src/components/feed/feed-card.tsx
index 3eda70d0..0fc04696 100644
--- a/src/components/feed/feed-card.tsx
+++ b/src/components/feed/feed-card.tsx
@@ -6,7 +6,7 @@ import { pickString, resolveNodeBody, resolveNodeTitle, resolveNodeThumbnail, un
 import { getSchemaIconInfo } from "@/lib/schema-icons"
 import { cn, formatCompactNumber } from "@/lib/utils"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 function timeAgo(value: unknown): string | null {
   const d = parseTimestamp(value)
diff --git a/src/components/layout/app-layout.tsx b/src/components/layout/app-layout.tsx
index 3b76d6e4..df4da20d 100644
--- a/src/components/layout/app-layout.tsx
+++ b/src/components/layout/app-layout.tsx
@@ -13,7 +13,7 @@ import { useNeighborFetch } from "@/hooks/use-neighbor-fetch"
 import { useDeepLink } from "@/hooks/use-deep-link"
 import { usePanelGraphSync } from "@/hooks/use-panel-graph-sync"
 import { isMocksEnabled } from "@/lib/mock-data"
-import { SMALL_SCHEMAS } from "@/app/ontology/mock-small"
+import { SMALL_SCHEMAS } from "@/app/admin/ontology/mock-small"
 import { SKINS } from "@/skins/index"
 import { cn } from "@/lib/utils"
 
diff --git a/src/components/layout/attachable-embeds.tsx b/src/components/layout/attachable-embeds.tsx
index 389b785c..a207a5b6 100644
--- a/src/components/layout/attachable-embeds.tsx
+++ b/src/components/layout/attachable-embeds.tsx
@@ -22,7 +22,7 @@ import { getAttachables } from "@/lib/graph-api"
 import type { GraphNode } from "@/lib/graph-api"
 import { resolveNodeTitle, resolveNodeThumbnail, pickString } from "@/lib/node-display"
 import { displayNodeType, cn } from "@/lib/utils"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 interface AttachableEmbedsProps {
   nodeRefId: string
diff --git a/src/components/layout/connections-section.tsx b/src/components/layout/connections-section.tsx
index 8df60989..f84d42f0 100644
--- a/src/components/layout/connections-section.tsx
+++ b/src/components/layout/connections-section.tsx
@@ -9,7 +9,7 @@ import { useModalStore } from "@/stores/modal-store"
 import { pickString, DISPLAY_KEY_FALLBACKS } from "@/lib/node-display"
 import { displayNodeType } from "@/lib/utils"
 import { deleteEdge } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import type { GraphNode } from "@/lib/graph-api"
 
 interface ConnectionsSectionProps {
diff --git a/src/components/layout/node-preview-panel.tsx b/src/components/layout/node-preview-panel.tsx
index bfe44c62..a3872ecd 100644
--- a/src/components/layout/node-preview-panel.tsx
+++ b/src/components/layout/node-preview-panel.tsx
@@ -26,7 +26,7 @@ import type { GraphNode, GraphData, StakworkRun } from "@/lib/graph-api"
 import { triggerDeepResearch, getLatestStakworkRun, getNode, isGraphData } from "@/lib/graph-api"
 import { getWatches, watchNode, unwatchNode } from "@/lib/watch-api"
 import { cookieStorage } from "@/lib/cookie-storage"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { ConnectionsSection } from "./connections-section"
 import { TranscriptChatWidget } from "../agent/transcript-chat"
 import type { AgentChatContext } from "../agent/transcript-chat"
diff --git a/src/components/layout/node-row.tsx b/src/components/layout/node-row.tsx
index ae723507..6870cb00 100644
--- a/src/components/layout/node-row.tsx
+++ b/src/components/layout/node-row.tsx
@@ -9,7 +9,7 @@ import { pickString, DISPLAY_KEY_FALLBACKS, capTitle } from "@/lib/node-display"
 import { getStatusBadge } from "@/lib/node-status"
 import { cn, displayNodeType } from "@/lib/utils"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { formatDateAbsolute } from "@/lib/date-format"
 
 interface NodeRowProps {
diff --git a/src/components/layout/toolkit.tsx b/src/components/layout/toolkit.tsx
index 8910d10a..4751997b 100644
--- a/src/components/layout/toolkit.tsx
+++ b/src/components/layout/toolkit.tsx
@@ -223,12 +223,12 @@ export function Toolkit({
           <ToolkitButton
             icon={Network}
             ariaLabel="Ontology"
-            onClick={() => router.push("/ontology")}
+            onClick={() => router.push("/admin/ontology")}
           />
           <ToolkitButton
             icon={Boxes}
             ariaLabel="Domains"
-            onClick={() => router.push("/domains")}
+            onClick={() => router.push("/admin/domains")}
           />
           <ToolkitButton
             icon={ClipboardList}
@@ -238,8 +238,8 @@ export function Toolkit({
           />
           <ToolkitButton
             icon={Settings}
-            ariaLabel="Settings"
-            onClick={() => router.push("/settings")}
+            ariaLabel="Admin"
+            onClick={() => router.push("/admin")}
           />
         </>
       )}
@@ -350,14 +350,14 @@ export function ToolkitFAB({
               <>
                 <div className="my-1 mx-2 h-px bg-border/60" />
                 {[
-                  { icon: Network, label: "Ontology", action: () => router.push("/ontology") },
-                  { icon: Boxes, label: "Domains", action: () => router.push("/domains") },
+                  { icon: Network, label: "Ontology", action: () => router.push("/admin/ontology") },
+                  { icon: Boxes, label: "Domains", action: () => router.push("/admin/domains") },
                   {
                     icon: ClipboardList,
                     label: `Reviews${pendingCount > 0 ? ` (${pendingCount})` : ""}`,
                     action: () => router.push("/admin/reviews"),
                   },
-                  { icon: Settings, label: "Settings", action: () => router.push("/settings") },
+                  { icon: Settings, label: "Admin", action: () => router.push("/admin") },
                 ].map(({ icon: Icon, label, action }) => (
                   <button
                     key={label}
diff --git a/src/components/modals/add-node-form.tsx b/src/components/modals/add-node-form.tsx
index 90cf384e..36ae6eea 100644
--- a/src/components/modals/add-node-form.tsx
+++ b/src/components/modals/add-node-form.tsx
@@ -17,7 +17,7 @@ import {
   getSchemaDomains,
   type SchemaDomainsResponse,
 } from "@/lib/graph-api"
-import type { SchemaNode, SchemaAttribute } from "@/app/ontology/page"
+import type { SchemaNode, SchemaAttribute } from "@/lib/schema-types"
 import {
   fieldsForSchema,
   humanizeFieldKey,
diff --git a/src/components/modals/domain-settings.tsx b/src/components/modals/domain-settings.tsx
deleted file mode 100644
index 6303fe4a..00000000
--- a/src/components/modals/domain-settings.tsx
+++ /dev/null
@@ -1,327 +0,0 @@
-"use client"
-
-import { useCallback, useEffect, useMemo, useState } from "react"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Search } from "lucide-react"
-import { getSchemaDomains, updateHiddenLists } from "@/lib/graph-api"
-import { isMocksEnabled, MOCK_DOMAINS } from "@/lib/mock-data"
-import { useSchemaStore } from "@/stores/schema-store"
-import { useAppStore } from "@/stores/app-store"
-import { cn } from "@/lib/utils"
-
-interface DomainSettingsProps {
-  open: boolean
-  /** Parent modal's pending title — used when saving hidden_types */
-  title: string
-  /** Parent modal's pending description — used when saving hidden_types */
-  description: string
-}
-
-export function DomainSettings({ open, title, description }: DomainSettingsProps) {
-  const schemas = useSchemaStore((s) => s.schemas)
-  const fetchSchemas = useSchemaStore((s) => s.fetchAll)
-  const setGraphMeta = useAppStore((s) => s.setGraphMeta)
-
-  const [availableDomains, setAvailableDomains] = useState<string[]>([])
-  const [hiddenSet, setHiddenSet] = useState<Set<string>>(new Set())
-  const [originalHidden, setOriginalHidden] = useState<Set<string>>(new Set())
-  const [hiddenDomainSet, setHiddenDomainSet] = useState<Set<string>>(new Set())
-  const [originalHiddenDomains, setOriginalHiddenDomains] = useState<Set<string>>(new Set())
-  const [loading, setLoading] = useState(true)
-  const [saving, setSaving] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [savedMessage, setSavedMessage] = useState<string | null>(null)
-  const [filter, setFilter] = useState("")
-
-  const load = useCallback(async () => {
-    setLoading(true)
-    setError(null)
-    try {
-      if (isMocksEnabled()) {
-        setAvailableDomains(MOCK_DOMAINS.domains)
-        const hiddenTypes = new Set(MOCK_DOMAINS.hidden_types)
-        const hiddenDomains = new Set(MOCK_DOMAINS.hidden_domains)
-        setHiddenSet(new Set(hiddenTypes))
-        setOriginalHidden(new Set(hiddenTypes))
-        setHiddenDomainSet(new Set(hiddenDomains))
-        setOriginalHiddenDomains(new Set(hiddenDomains))
-      } else {
-        const res = await getSchemaDomains()
-        setAvailableDomains(res.domains ?? [])
-        const hiddenTypes = new Set(res.hidden_types ?? [])
-        const hiddenDomains = new Set(res.hidden_domains ?? [])
-        setHiddenSet(new Set(hiddenTypes))
-        setOriginalHidden(new Set(hiddenTypes))
-        setHiddenDomainSet(new Set(hiddenDomains))
-        setOriginalHiddenDomains(new Set(hiddenDomains))
-      }
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to load domains")
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    if (!open) return
-    load()
-    if (schemas.length === 0) fetchSchemas()
-  }, [open, load, schemas.length, fetchSchemas])
-
-  // Hideable types = everything except the root "Thing"
-  const hideableTypes = useMemo(() => {
-    return schemas
-      .filter((s) => s.type && s.type !== "Thing")
-      .map((s) => ({ type: s.type, parent: s.parent }))
-      .sort((a, b) => a.type.localeCompare(b.type))
-  }, [schemas])
-
-  const filteredTypes = useMemo(() => {
-    const q = filter.trim().toLowerCase()
-    if (!q) return hideableTypes
-    return hideableTypes.filter((t) => t.type.toLowerCase().includes(q))
-  }, [hideableTypes, filter])
-
-  const toggleType = (type: string) => {
-    setHiddenSet((prev) => {
-      const next = new Set(prev)
-      if (next.has(type)) next.delete(type)
-      else next.add(type)
-      return next
-    })
-    setSavedMessage(null)
-  }
-
-  const toggleDomain = (domain: string) => {
-    setHiddenDomainSet((prev) => {
-      const next = new Set(prev)
-      if (next.has(domain)) next.delete(domain)
-      else next.add(domain)
-      return next
-    })
-    setSavedMessage(null)
-  }
-
-  const setsEqual = (a: Set<string>, b: Set<string>) => {
-    if (a.size !== b.size) return false
-    for (const x of a) if (!b.has(x)) return false
-    return true
-  }
-
-  const typesDirty = useMemo(
-    () => !setsEqual(hiddenSet, originalHidden),
-    [hiddenSet, originalHidden]
-  )
-  const domainsDirty = useMemo(
-    () => !setsEqual(hiddenDomainSet, originalHiddenDomains),
-    [hiddenDomainSet, originalHiddenDomains]
-  )
-  const dirty = typesDirty || domainsDirty
-
-  const handleSave = useCallback(async () => {
-    setSaving(true)
-    setError(null)
-    setSavedMessage(null)
-    const nextTypes = Array.from(hiddenSet).sort()
-    const nextDomains = Array.from(hiddenDomainSet).sort()
-    try {
-      if (!isMocksEnabled()) {
-        await updateHiddenLists(
-          title,
-          description,
-          typesDirty ? nextTypes : undefined,
-          domainsDirty ? nextDomains : undefined,
-        )
-      }
-      setGraphMeta(title, description)
-      setOriginalHidden(new Set(nextTypes))
-      setOriginalHiddenDomains(new Set(nextDomains))
-      const relabel = typesDirty || domainsDirty
-      setSavedMessage(
-        relabel
-          ? "Saved — nodes are being relabeled in the background."
-          : "Saved."
-      )
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to save")
-    } finally {
-      setSaving(false)
-    }
-  }, [hiddenSet, hiddenDomainSet, typesDirty, domainsDirty, title, description, setGraphMeta])
-
-  if (loading) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <div className="h-5 w-5 rounded-full border-2 border-primary/30 border-t-primary animate-spin" />
-      </div>
-    )
-  }
-
-  if (error) {
-    return (
-      <div className="space-y-3">
-        <p className="text-xs text-destructive">{error}</p>
-        <Button size="sm" variant="outline" onClick={load}>
-          Retry
-        </Button>
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="space-y-2">
-        <div className="flex items-baseline justify-between">
-          <p className="text-[11px] uppercase tracking-wider font-heading text-muted-foreground">
-            Available domains
-          </p>
-          <p className="text-[10px] text-muted-foreground">
-            {hiddenDomainSet.size} hidden
-          </p>
-        </div>
-        <p className="text-[11px] text-muted-foreground leading-relaxed">
-          Click a domain to hide/show it. Hidden domains (and their descendants)
-          are excluded from search.
-        </p>
-        {availableDomains.length === 0 ? (
-          <p className="text-xs text-muted-foreground">
-            No domain roots found. Add a schema type as a child of <code>Thing</code> to define one.
-          </p>
-        ) : (
-          <div className="flex flex-wrap gap-1.5">
-            {availableDomains.map((d) => {
-              const hidden = hiddenDomainSet.has(d)
-              return (
-                <button
-                  key={d}
-                  type="button"
-                  onClick={() => toggleDomain(d)}
-                  className={cn(
-                    "inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-[11px] font-mono transition-colors cursor-pointer",
-                    hidden
-                      ? "border-amber-400/40 bg-amber-400/10 text-amber-200/90 hover:bg-amber-400/20"
-                      : "border-border/50 bg-muted/30 text-foreground hover:bg-muted/50"
-                  )}
-                >
-                  <span
-                    className={cn(
-                      "h-1.5 w-1.5 rounded-full",
-                      hidden ? "bg-amber-400/70" : "bg-primary/70"
-                    )}
-                  />
-                  {d}
-                  {hidden && (
-                    <span className="text-[9px] uppercase tracking-wider text-amber-400/80">
-                      hidden
-                    </span>
-                  )}
-                </button>
-              )
-            })}
-          </div>
-        )}
-      </div>
-
-      <div className="space-y-2">
-        <div className="flex items-baseline justify-between">
-          <p className="text-[11px] uppercase tracking-wider font-heading text-muted-foreground">
-            Hide schema types
-          </p>
-          <p className="text-[10px] text-muted-foreground">
-            {hiddenSet.size} hidden
-          </p>
-        </div>
-        <p className="text-[11px] text-muted-foreground leading-relaxed">
-          Hidden types (and their descendants) are excluded from domain search
-          indexes. Existing nodes are re-labeled in the background after save.
-        </p>
-
-        <div className="relative">
-          <Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground" />
-          <Input
-            value={filter}
-            onChange={(e) => setFilter(e.target.value)}
-            placeholder="Filter types..."
-            className="h-8 pl-8 text-xs bg-muted/30 border-border/40"
-          />
-        </div>
-
-        {hideableTypes.length === 0 ? (
-          <p className="text-xs text-muted-foreground py-4 text-center">
-            No schema types to hide.
-          </p>
-        ) : filteredTypes.length === 0 ? (
-          <p className="text-xs text-muted-foreground py-4 text-center">
-            No types match the filter.
-          </p>
-        ) : (
-          <div className="max-h-64 overflow-y-auto rounded-md border border-border/40 divide-y divide-border/30">
-            {filteredTypes.map(({ type, parent }) => {
-              const hidden = hiddenSet.has(type)
-              return (
-                <label
-                  key={type}
-                  className={cn(
-                    "flex items-center gap-2.5 px-3 py-2 cursor-pointer transition-colors",
-                    hidden ? "bg-muted/30" : "hover:bg-muted/20"
-                  )}
-                >
-                  <input
-                    type="checkbox"
-                    checked={hidden}
-                    onChange={() => toggleType(type)}
-                    className="h-3.5 w-3.5 shrink-0 rounded border-border text-primary focus:ring-primary/40"
-                  />
-                  <div className="flex-1 min-w-0">
-                    <p className={cn("text-xs truncate", hidden ? "text-foreground" : "text-foreground/90")}>
-                      {type}
-                    </p>
-                    {parent && (
-                      <p className="text-[10px] font-mono text-muted-foreground/70 truncate">
-                        ↳ {parent}
-                      </p>
-                    )}
-                  </div>
-                  {hidden && (
-                    <span className="text-[9px] font-mono uppercase tracking-wider text-amber-400/80 shrink-0">
-                      hidden
-                    </span>
-                  )}
-                </label>
-              )
-            })}
-          </div>
-        )}
-      </div>
-
-      {savedMessage && (
-        <p className="text-[11px] text-emerald-400">{savedMessage}</p>
-      )}
-
-      <div className="flex justify-end gap-2 pt-1">
-        <Button
-          variant="ghost"
-          size="sm"
-          onClick={() => {
-            setHiddenSet(new Set(originalHidden))
-            setHiddenDomainSet(new Set(originalHiddenDomains))
-            setSavedMessage(null)
-          }}
-          disabled={!dirty || saving}
-          className="text-xs"
-        >
-          Reset
-        </Button>
-        <Button
-          size="sm"
-          onClick={handleSave}
-          disabled={!dirty || saving}
-          className="text-xs bg-primary text-primary-foreground hover:bg-primary/90"
-        >
-          {saving ? "Saving..." : "Save"}
-        </Button>
-      </div>
-    </div>
-  )
-}
diff --git a/src/components/modals/edit-node-modal.tsx b/src/components/modals/edit-node-modal.tsx
index 9ba27c1d..ea7412b5 100644
--- a/src/components/modals/edit-node-modal.tsx
+++ b/src/components/modals/edit-node-modal.tsx
@@ -32,7 +32,7 @@ import {
   type FuzzyMapping,
   type UnmappedField,
 } from "@/lib/node-remap"
-import type { SchemaNode, SchemaAttribute } from "@/app/ontology/page"
+import type { SchemaNode, SchemaAttribute } from "@/lib/schema-types"
 import { cn } from "@/lib/utils"
 
 // ---------------------------------------------------------------------------
diff --git a/src/components/universe/graph-canvas.tsx b/src/components/universe/graph-canvas.tsx
index c701cbaa..4d2f68d8 100644
--- a/src/components/universe/graph-canvas.tsx
+++ b/src/components/universe/graph-canvas.tsx
@@ -30,7 +30,7 @@ import type {
 import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/graph-api"
 import { useGraphStore } from "@/stores/graph-store"
 import { useAppStore } from "@/stores/app-store"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { HoverPreviewCard } from "./hover-preview-card"
 import { DISPLAY_KEY_FALLBACKS, resolveNodeThumbnail } from "@/lib/node-display"
 
diff --git a/src/components/universe/hover-preview-card.tsx b/src/components/universe/hover-preview-card.tsx
index 7d698a30..9ced9af6 100644
--- a/src/components/universe/hover-preview-card.tsx
+++ b/src/components/universe/hover-preview-card.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react"
 import { getSchemaIconInfo } from "@/lib/schema-icons"
 import { Badge } from "@/components/ui/badge"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 import { DISPLAY_KEY_FALLBACKS, capTitle } from "@/lib/node-display"
 const SNIPPET_KEYS = ["description", "text", "bio", "content", "body"] as const
 const CARD_WIDTH = 280
diff --git a/src/lib/__tests__/admin-general-page.test.tsx b/src/lib/__tests__/admin-general-page.test.tsx
new file mode 100644
index 00000000..195c9719
--- /dev/null
+++ b/src/lib/__tests__/admin-general-page.test.tsx
@@ -0,0 +1,83 @@
+/**
+ * Tests for src/app/admin/(console)/general/page.tsx — the graph name/description
+ * form lifted out of the old settings page.
+ *
+ * Covers:
+ * - Inputs pre-filled from the app store
+ * - Save calls api.post("/about") and setGraphMeta
+ * - Cancel resets the form to store values
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen, fireEvent, waitFor } from "@testing-library/react"
+
+const appState = {
+  graphName: "Test Graph",
+  graphDescription: "A test description",
+  setGraphMeta: vi.fn(),
+}
+vi.mock("@/stores/app-store", () => ({
+  useAppStore: (sel?: (s: unknown) => unknown) => (sel ? sel(appState) : appState),
+}))
+
+const mockApiPost = vi.fn().mockResolvedValue({})
+vi.mock("@/lib/api", () => ({
+  api: { post: (...args: unknown[]) => mockApiPost(...args) },
+}))
+
+vi.mock("@/lib/input-limits", () => ({
+  MAX_LENGTHS: { GRAPH_NAME: 100, GRAPH_DESCRIPTION: 500 },
+}))
+
+async function renderPage() {
+  const { default: GeneralSettingsPage } = await import(
+    "@/app/admin/(console)/general/page"
+  )
+  return render(<GeneralSettingsPage />)
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  appState.graphName = "Test Graph"
+  appState.graphDescription = "A test description"
+})
+
+describe("GeneralSettingsPage", () => {
+  it("renders name and description pre-filled from the store", async () => {
+    await renderPage()
+    const name = screen.getByLabelText(/Graph Name/i) as HTMLInputElement
+    const desc = screen.getByLabelText(/Description/i) as HTMLTextAreaElement
+    expect(name.value).toBe("Test Graph")
+    expect(desc.value).toBe("A test description")
+  })
+
+  it("calls api.post('/about') and setGraphMeta on save", async () => {
+    await renderPage()
+    fireEvent.change(screen.getByLabelText(/Graph Name/i), {
+      target: { value: "New Name" },
+    })
+    fireEvent.click(screen.getByRole("button", { name: /Save Changes/i }))
+
+    await waitFor(() =>
+      expect(mockApiPost).toHaveBeenCalledWith("/about", {
+        title: "New Name",
+        description: "A test description",
+      })
+    )
+    await waitFor(() =>
+      expect(appState.setGraphMeta).toHaveBeenCalledWith(
+        "New Name",
+        "A test description"
+      )
+    )
+  })
+
+  it("Cancel resets the form to store values", async () => {
+    await renderPage()
+    const name = screen.getByLabelText(/Graph Name/i) as HTMLInputElement
+    fireEvent.change(name, { target: { value: "Changed" } })
+    expect(name.value).toBe("Changed")
+    fireEvent.click(screen.getByRole("button", { name: /Cancel/i }))
+    expect(name.value).toBe("Test Graph")
+  })
+})
diff --git a/src/lib/__tests__/admin-guard.test.tsx b/src/lib/__tests__/admin-guard.test.tsx
new file mode 100644
index 00000000..336d8c13
--- /dev/null
+++ b/src/lib/__tests__/admin-guard.test.tsx
@@ -0,0 +1,69 @@
+/**
+ * Tests for src/app/admin/layout.tsx — the single admin guard for /admin/*.
+ *
+ * Covers:
+ * - Authenticated non-admin is redirected to "/"
+ * - Authenticated non-admin renders no children
+ * - Admin renders children, no redirect
+ * - Unauthenticated (auth not yet resolved) renders children, no redirect
+ */
+
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen, waitFor } from "@testing-library/react"
+
+const userState = { isAuthenticated: false, isAdmin: false }
+vi.mock("@/stores/user-store", () => ({
+  useUserStore: (sel?: (s: unknown) => unknown) => (sel ? sel(userState) : userState),
+}))
+
+const mockReplace = vi.fn()
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({ replace: mockReplace }),
+}))
+
+async function renderLayout() {
+  const { default: AdminLayout } = await import("@/app/admin/layout")
+  return render(
+    <AdminLayout>
+      <div data-testid="admin-child">Admin content</div>
+    </AdminLayout>
+  )
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  userState.isAuthenticated = false
+  userState.isAdmin = false
+})
+
+describe("AdminLayout guard", () => {
+  it("redirects authenticated non-admin to /", async () => {
+    userState.isAuthenticated = true
+    userState.isAdmin = false
+    await renderLayout()
+    await waitFor(() => expect(mockReplace).toHaveBeenCalledWith("/"))
+  })
+
+  it("renders no children for authenticated non-admin", async () => {
+    userState.isAuthenticated = true
+    userState.isAdmin = false
+    await renderLayout()
+    expect(screen.queryByTestId("admin-child")).not.toBeInTheDocument()
+  })
+
+  it("renders children and does not redirect for admins", async () => {
+    userState.isAuthenticated = true
+    userState.isAdmin = true
+    await renderLayout()
+    expect(screen.getByTestId("admin-child")).toBeInTheDocument()
+    expect(mockReplace).not.toHaveBeenCalled()
+  })
+
+  it("renders children and does not redirect before auth resolves", async () => {
+    userState.isAuthenticated = false
+    userState.isAdmin = false
+    await renderLayout()
+    expect(screen.getByTestId("admin-child")).toBeInTheDocument()
+    expect(mockReplace).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/lib/__tests__/domain-panel.test.tsx b/src/lib/__tests__/domain-panel.test.tsx
index 33e494f7..efe4df52 100644
--- a/src/lib/__tests__/domain-panel.test.tsx
+++ b/src/lib/__tests__/domain-panel.test.tsx
@@ -1,8 +1,8 @@
 import { describe, it, expect, vi } from "vitest"
 import { render, screen, within } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
-import { DomainPanel, type DomainRow } from "@/app/domains/domain-panel"
-import type { SchemaNode } from "@/app/ontology/page"
+import { DomainPanel, type DomainRow } from "@/app/admin/domains/domain-panel"
+import type { SchemaNode } from "@/lib/schema-types"
 
 function schema(type: string, domain?: string): SchemaNode {
   return {
@@ -37,6 +37,8 @@ const defaultProps = {
   onAddTypes: vi.fn(),
   onRemoveType: vi.fn(),
   onToggleHidden: vi.fn(),
+  hiddenTypes: new Set<string>(),
+  onToggleTypeHidden: vi.fn(),
   onDelete: vi.fn(),
   onClose: vi.fn(),
 }
@@ -79,6 +81,30 @@ describe("DomainPanel", () => {
     expect(onToggleHidden).toHaveBeenCalledWith(true)
   })
 
+  it("hiding a member type calls onToggleTypeHidden", async () => {
+    const onToggleTypeHidden = vi.fn()
+    render(<DomainPanel {...defaultProps} onToggleTypeHidden={onToggleTypeHidden} />)
+    const row = screen.getByText("TwitterAccount").closest("div")!.parentElement!
+    const hideBtn = within(row).getByTitle(/Hide type from search/)
+    await userEvent.click(hideBtn)
+    expect(onToggleTypeHidden).toHaveBeenCalledWith("TwitterAccount", true)
+  })
+
+  it("shows a hidden member type as toggleable back on", async () => {
+    const onToggleTypeHidden = vi.fn()
+    render(
+      <DomainPanel
+        {...defaultProps}
+        hiddenTypes={new Set(["TwitterAccount"])}
+        onToggleTypeHidden={onToggleTypeHidden}
+      />
+    )
+    const row = screen.getByText("TwitterAccount").closest("div")!.parentElement!
+    const showBtn = within(row).getByTitle(/Show type in search/)
+    await userEvent.click(showBtn)
+    expect(onToggleTypeHidden).toHaveBeenCalledWith("TwitterAccount", false)
+  })
+
   it("delete is unavailable while the domain has members", () => {
     render(<DomainPanel {...defaultProps} />)
     expect(screen.queryByText(/Delete empty domain/)).toBeNull()
diff --git a/src/lib/__tests__/edge-type-view.test.tsx b/src/lib/__tests__/edge-type-view.test.tsx
index e54c0b5e..4c267c5a 100644
--- a/src/lib/__tests__/edge-type-view.test.tsx
+++ b/src/lib/__tests__/edge-type-view.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from "vitest"
 import { render, screen } from "@testing-library/react"
-import { EdgeTypePanel } from "@/app/ontology/edge-type-panel"
-import type { SchemaEdge, SchemaNode } from "@/app/ontology/page"
+import { EdgeTypePanel } from "@/app/admin/ontology/edge-type-panel"
+import type { SchemaEdge, SchemaNode } from "@/lib/schema-types"
 
 // ---------------------------------------------------------------------------
 // Helpers
diff --git a/src/lib/__tests__/hover-preview-card.test.tsx b/src/lib/__tests__/hover-preview-card.test.tsx
index 4a8ac06b..6e55a5c8 100644
--- a/src/lib/__tests__/hover-preview-card.test.tsx
+++ b/src/lib/__tests__/hover-preview-card.test.tsx
@@ -2,7 +2,7 @@ import { render } from "@testing-library/react"
 import { describe, it, expect } from "vitest"
 import { HoverPreviewCard } from "@/components/universe/hover-preview-card"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 const baseSchema: SchemaNode = {
   type: "topic",
diff --git a/src/lib/__tests__/node-display.test.ts b/src/lib/__tests__/node-display.test.ts
index 9d1cae37..7da72c24 100644
--- a/src/lib/__tests__/node-display.test.ts
+++ b/src/lib/__tests__/node-display.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest"
 import { capTitle, TITLE_MAX_LEN, resolveNodeTitle } from "@/lib/node-display"
 import type { GraphNode } from "@/lib/graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 describe("capTitle", () => {
   it("returns string unchanged when <= 120 chars", () => {
diff --git a/src/lib/__tests__/node-remap.test.ts b/src/lib/__tests__/node-remap.test.ts
index 4c06d6dd..0e411fd3 100644
--- a/src/lib/__tests__/node-remap.test.ts
+++ b/src/lib/__tests__/node-remap.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest"
 import { fuzzyScore, computeMappings } from "@/lib/node-remap"
-import type { SchemaAttribute } from "@/app/ontology/page"
+import type { SchemaAttribute } from "@/lib/schema-types"
 
 // ---------------------------------------------------------------------------
 // Helpers
diff --git a/src/lib/__tests__/node-schema-utils.test.ts b/src/lib/__tests__/node-schema-utils.test.ts
index e6660b21..9819df0b 100644
--- a/src/lib/__tests__/node-schema-utils.test.ts
+++ b/src/lib/__tests__/node-schema-utils.test.ts
@@ -6,7 +6,7 @@ import {
   fieldsForSchema,
   OPTIONAL_GROUP_ORDER,
 } from "@/lib/node-schema-utils"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 describe("humanizeFieldKey", () => {
   it("title-cases snake_case keys", () => {
diff --git a/src/lib/__tests__/schema-audit.test.tsx b/src/lib/__tests__/schema-audit.test.tsx
index d62ef947..f2b66b17 100644
--- a/src/lib/__tests__/schema-audit.test.tsx
+++ b/src/lib/__tests__/schema-audit.test.tsx
@@ -57,7 +57,7 @@ vi.mock("@/lib/mock-data", () => ({
 }))
 
 async function renderAuditSettings(open = true) {
-  const { SchemaAuditSettings } = await import("@/app/settings/schema-audit")
+  const { SchemaAuditSettings } = await import("@/components/admin/schema-audit")
   return render(<SchemaAuditSettings open={open} />)
 }
 
diff --git a/src/lib/__tests__/settings-page.test.tsx b/src/lib/__tests__/settings-page.test.tsx
deleted file mode 100644
index d551429b..00000000
--- a/src/lib/__tests__/settings-page.test.tsx
+++ /dev/null
@@ -1,373 +0,0 @@
-/**
- * Tests for src/app/settings/page.tsx
- *
- * Covers:
- * - Admin guard: non-admins are redirected to "/"
- * - Admin guard: authenticated non-admin renders null
- * - Admin-only tabs not rendered for non-admins
- * - General form fields present for admins
- * - Tab query-param logic: ?tab=janitors → "janitor" active (invalid tab falls back)
- * - Saving calls api.post("/about") and setGraphMeta
- */
-
-import { describe, it, expect, vi, beforeEach } from "vitest"
-import { render, screen, fireEvent, waitFor } from "@testing-library/react"
-import React, { Suspense } from "react"
-
-// ── Store mocks ───────────────────────────────────────────────────────────────
-
-const userState = { isAuthenticated: false, isAdmin: false }
-vi.mock("@/stores/user-store", () => ({
-  useUserStore: (sel?: (s: unknown) => unknown) => (sel ? sel(userState) : userState),
-}))
-
-const appState = {
-  graphName: "Test Graph",
-  graphDescription: "A test description",
-  setGraphMeta: vi.fn(),
-  activeSkin: "default" as string,
-  setActiveSkin: vi.fn(),
-}
-vi.mock("@/stores/app-store", () => ({
-  useAppStore: (sel?: (s: unknown) => unknown) => (sel ? sel(appState) : appState),
-}))
-
-const mockApiPost = vi.fn().mockResolvedValue({})
-vi.mock("@/lib/api", () => ({
-  api: { post: (...args: unknown[]) => mockApiPost(...args) },
-}))
-
-// ── Next.js mocks ─────────────────────────────────────────────────────────────
-
-const mockReplace = vi.fn()
-const mockPush = vi.fn()
-vi.mock("next/navigation", () => ({
-  useRouter: () => ({ replace: mockReplace, push: mockPush }),
-  useSearchParams: () => mockSearchParams,
-}))
-
-let mockSearchParams: { get: (key: string) => string | null } = { get: () => null }
-
-// ── Dynamic import shimmed to synchronous stubs ───────────────────────────────
-
-vi.mock("@/components/modals/radar-settings", () => ({
-  RadarSettings: ({ open }: { open: boolean }) =>
-    open ? <div data-testid="radar-settings">Radar</div> : null,
-}))
-vi.mock("@/components/modals/janitor-settings", () => ({
-  JanitorSettings: ({ open }: { open: boolean }) =>
-    open ? <div data-testid="janitor-settings">Janitor</div> : null,
-}))
-vi.mock("@/components/modals/domain-settings", () => ({
-  DomainSettings: ({ open }: { open: boolean }) =>
-    open ? <div data-testid="domain-settings">Domains</div> : null,
-}))
-vi.mock("@/app/settings/schema-audit", () => ({
-  SchemaAuditSettings: ({ open }: { open: boolean }) =>
-    open ? <div data-testid="schema-audit-settings">Audit</div> : null,
-}))
-vi.mock("@/app/settings/appearance-settings", () => ({
-  AppearanceSettings: ({ open }: { open: boolean }) =>
-    open ? <div data-testid="appearance-settings">Appearance</div> : null,
-}))
-
-// next/dynamic is used in the page; replace with a passthrough so mocked modules are used
-vi.mock("next/dynamic", () => ({
-  default: (
-    loader: () => Promise<{ default?: unknown; [k: string]: unknown }>,
-    _opts?: unknown
-  ) => {
-    // Return a component that lazily calls the loader and renders
-    // We need to resolve synchronously for tests; use a wrapper.
-    const DynamicWrapper = (props: Record<string, unknown>) => {
-      const [Comp, setComp] = React.useState<React.ComponentType<Record<string, unknown>> | null>(null)
-      React.useEffect(() => {
-        loader().then((mod) => {
-          const exported = Object.values(mod).find(
-            (v) => typeof v === "function"
-          ) as React.ComponentType<Record<string, unknown>> | undefined
-          if (exported) setComp(() => exported)
-        })
-      }, [])
-      return Comp ? <Comp {...props} /> : null
-    }
-    return DynamicWrapper
-  },
-}))
-
-// ── Input limits ─────────────────────────────────────────────────────────────
-
-vi.mock("@/lib/input-limits", () => ({
-  MAX_LENGTHS: { GRAPH_NAME: 100, GRAPH_DESCRIPTION: 500 },
-}))
-
-// ── Helpers ───────────────────────────────────────────────────────────────────
-
-async function renderPage() {
-  const { default: SettingsPage } = await import("@/app/settings/page")
-  const { unmount } = render(
-    <Suspense fallback={null}>
-      <SettingsPage />
-    </Suspense>
-  )
-  return { unmount }
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  userState.isAuthenticated = false
-  userState.isAdmin = false
-  mockSearchParams = { get: () => null }
-  appState.graphName = "Test Graph"
-  appState.graphDescription = "A test description"
-})
-
-// ── Admin guard ───────────────────────────────────────────────────────────────
-
-describe("SettingsPage – admin guard", () => {
-  it("redirects authenticated non-admin to /", async () => {
-    userState.isAuthenticated = true
-    userState.isAdmin = false
-    await renderPage()
-    await waitFor(() => {
-      expect(mockReplace).toHaveBeenCalledWith("/")
-    })
-  })
-
-  it("renders null when authenticated and not admin", async () => {
-    userState.isAuthenticated = true
-    userState.isAdmin = false
-    const { unmount } = await renderPage()
-    // page returns null for non-admins
-    await waitFor(() => {
-      expect(screen.queryByText("Graph Settings")).not.toBeInTheDocument()
-    })
-    unmount()
-  })
-
-  it("does NOT redirect when isAdmin=true", async () => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-    await renderPage()
-    await waitFor(() => {
-      expect(mockReplace).not.toHaveBeenCalled()
-    })
-  })
-
-  it("does NOT redirect when not yet authenticated", async () => {
-    userState.isAuthenticated = false
-    userState.isAdmin = false
-    await renderPage()
-    // no redirect fired because the guard only fires when isAuthenticated && !isAdmin
-    expect(mockReplace).not.toHaveBeenCalled()
-  })
-})
-
-// ── General tab content ───────────────────────────────────────────────────────
-
-describe("SettingsPage – General tab", () => {
-  beforeEach(() => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-  })
-
-  it("renders the Graph Settings heading", async () => {
-    await renderPage()
-    expect(screen.getByText("Graph Settings")).toBeInTheDocument()
-  })
-
-  it("renders graph name input pre-filled", async () => {
-    await renderPage()
-    const input = screen.getByLabelText(/Graph Name/i) as HTMLInputElement
-    expect(input).toBeInTheDocument()
-    expect(input.value).toBe("Test Graph")
-  })
-
-  it("renders description textarea pre-filled", async () => {
-    await renderPage()
-    const textarea = screen.getByLabelText(/Description/i) as HTMLTextAreaElement
-    expect(textarea).toBeInTheDocument()
-    expect(textarea.value).toBe("A test description")
-  })
-
-  it("shows Save Changes and Cancel buttons for admins", async () => {
-    await renderPage()
-    expect(screen.getByRole("button", { name: /Save Changes/i })).toBeInTheDocument()
-    expect(screen.getByRole("button", { name: /Cancel/i })).toBeInTheDocument()
-  })
-})
-
-// ── Admin-only tabs ───────────────────────────────────────────────────────────
-
-describe("SettingsPage – admin-only tabs", () => {
-  it("shows Schedule, Janitors, Domains, Audit tabs for admins", async () => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-    await renderPage()
-    expect(screen.getByRole("tab", { name: /Schedule/i })).toBeInTheDocument()
-    expect(screen.getByRole("tab", { name: /Janitors/i })).toBeInTheDocument()
-    expect(screen.getByRole("tab", { name: /Domains/i })).toBeInTheDocument()
-    expect(screen.getByRole("tab", { name: /Audit/i })).toBeInTheDocument()
-  })
-
-  it("does not show admin-only tabs for non-admins (not yet authenticated)", async () => {
-    // Not authenticated, not admin → page still renders (no redirect guard fires for unauthenticated)
-    userState.isAuthenticated = false
-    userState.isAdmin = false
-    await renderPage()
-    expect(screen.queryByRole("tab", { name: /Schedule/i })).not.toBeInTheDocument()
-    expect(screen.queryByRole("tab", { name: /Janitors/i })).not.toBeInTheDocument()
-    expect(screen.queryByRole("tab", { name: /Domains/i })).not.toBeInTheDocument()
-    expect(screen.queryByRole("tab", { name: /Audit/i })).not.toBeInTheDocument()
-  })
-})
-
-// ── Tab query-param logic ─────────────────────────────────────────────────────
-
-describe("SettingsPage – tab query param", () => {
-  beforeEach(() => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-  })
-
-  it("defaults to general tab when no ?tab param", async () => {
-    mockSearchParams = { get: () => null }
-    await renderPage()
-    const generalTab = screen.getByRole("tab", { name: /General/i })
-    expect(generalTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("activates janitor tab for ?tab=janitor", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "janitor" : null) }
-    await renderPage()
-    const janitorTab = screen.getByRole("tab", { name: /Janitors/i })
-    expect(janitorTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("activates radar tab for ?tab=radar", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "radar" : null) }
-    await renderPage()
-    const radarTab = screen.getByRole("tab", { name: /Schedule/i })
-    expect(radarTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("activates domains tab for ?tab=domains", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "domains" : null) }
-    await renderPage()
-    const domainsTab = screen.getByRole("tab", { name: /Domains/i })
-    expect(domainsTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("activates audit tab for ?tab=audit", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "audit" : null) }
-    await renderPage()
-    const auditTab = screen.getByRole("tab", { name: /Audit/i })
-    expect(auditTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("falls back to general for unknown ?tab value", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "unknown-tab-xyz" : null) }
-    await renderPage()
-    const generalTab = screen.getByRole("tab", { name: /General/i })
-    expect(generalTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("falls back to general for admin-only tab when not admin", async () => {
-    // Non-admin with ?tab=janitor → should resolve to general
-    userState.isAuthenticated = false
-    userState.isAdmin = false
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "janitor" : null) }
-    await renderPage()
-    const generalTab = screen.getByRole("tab", { name: /General/i })
-    expect(generalTab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("updates URL when switching tabs", async () => {
-    mockSearchParams = { get: () => null }
-    await renderPage()
-    const radarTab = screen.getByRole("tab", { name: /Schedule/i })
-    fireEvent.click(radarTab)
-    expect(mockReplace).toHaveBeenCalledWith("/settings?tab=radar")
-  })
-})
-
-// ── Save handler ──────────────────────────────────────────────────────────────
-
-describe("SettingsPage – save handler", () => {
-  beforeEach(() => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-  })
-
-  it("calls api.post('/about') and setGraphMeta on save", async () => {
-    await renderPage()
-
-    const nameInput = screen.getByLabelText(/Graph Name/i)
-    fireEvent.change(nameInput, { target: { value: "New Name" } })
-
-    const saveBtn = screen.getByRole("button", { name: /Save Changes/i })
-    fireEvent.click(saveBtn)
-
-    await waitFor(() => {
-      expect(mockApiPost).toHaveBeenCalledWith("/about", {
-        title: "New Name",
-        description: "A test description",
-      })
-    })
-    await waitFor(() => {
-      expect(appState.setGraphMeta).toHaveBeenCalledWith("New Name", "A test description")
-    })
-  })
-
-  it("Cancel button resets form to store values", async () => {
-    await renderPage()
-
-    const nameInput = screen.getByLabelText(/Graph Name/i) as HTMLInputElement
-    fireEvent.change(nameInput, { target: { value: "Changed Name" } })
-    expect(nameInput.value).toBe("Changed Name")
-
-    fireEvent.click(screen.getByRole("button", { name: /Cancel/i }))
-    expect(nameInput.value).toBe("Test Graph")
-  })
-})
-
-// ── Back button ───────────────────────────────────────────────────────────────
-
-describe("SettingsPage – back button", () => {
-  it("back button navigates to /", async () => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-    await renderPage()
-    const backBtn = screen.getByRole("button", { name: "" }) // ArrowLeft icon button
-    fireEvent.click(backBtn)
-    expect(mockPush).toHaveBeenCalledWith("/")
-  })
-})
-
-// ── Appearance tab ────────────────────────────────────────────────────────────
-
-describe("SettingsPage – Appearance tab", () => {
-  beforeEach(() => {
-    userState.isAuthenticated = true
-    userState.isAdmin = true
-    mockSearchParams = { get: () => null }
-  })
-
-  it("renders Appearance tab trigger for admin", async () => {
-    await renderPage()
-    expect(screen.getByRole("tab", { name: /Appearance/i })).toBeInTheDocument()
-  })
-
-  it("activates Appearance tab for ?tab=appearance", async () => {
-    mockSearchParams = { get: (k: string) => (k === "tab" ? "appearance" : null) }
-    await renderPage()
-    const tab = screen.getByRole("tab", { name: /Appearance/i })
-    expect(tab).toHaveAttribute("aria-selected", "true")
-  })
-
-  it("does not render Appearance tab for non-admins", async () => {
-    userState.isAdmin = false
-    await renderPage()
-    expect(screen.queryByRole("tab", { name: /Appearance/i })).not.toBeInTheDocument()
-  })
-})
diff --git a/src/lib/__tests__/skin-system.test.tsx b/src/lib/__tests__/skin-system.test.tsx
index 07f15ad7..826b5ea4 100644
--- a/src/lib/__tests__/skin-system.test.tsx
+++ b/src/lib/__tests__/skin-system.test.tsx
@@ -49,7 +49,7 @@ vi.mock("@/hooks/use-neighbor-fetch", () => ({ useNeighborFetch: vi.fn() }))
 vi.mock("@/hooks/use-deep-link", () => ({ useDeepLink: vi.fn() }))
 vi.mock("@/hooks/use-panel-graph-sync", () => ({ usePanelGraphSync: vi.fn() }))
 vi.mock("@/lib/mock-data", () => ({ isMocksEnabled: vi.fn().mockReturnValue(false) }))
-vi.mock("@/app/ontology/mock-small", () => ({ SMALL_SCHEMAS: [] }))
+vi.mock("@/app/admin/ontology/mock-small", () => ({ SMALL_SCHEMAS: [] }))
 vi.mock("@/stores/schema-store", () => ({
   useSchemaStore: (sel?: (s: { schemas: unknown[]; fetchAll: () => void }) => unknown) => {
     const state = { schemas: [], fetchAll: vi.fn() }
@@ -170,7 +170,7 @@ describe("AppearanceSettings – skin selection and save", () => {
 
   async function renderAppearance(skinOverride = "default") {
     appStoreMockState.activeSkin = skinOverride
-    const { AppearanceSettings } = await import("@/app/settings/appearance-settings")
+    const { AppearanceSettings } = await import("@/components/admin/appearance-settings")
     render(<AppearanceSettings open={true} />)
   }
 
@@ -237,7 +237,7 @@ describe("AppearanceSettings – skin selection and save", () => {
   })
 
   it("renders nothing when open=false", async () => {
-    const { AppearanceSettings } = await import("@/app/settings/appearance-settings")
+    const { AppearanceSettings } = await import("@/components/admin/appearance-settings")
     const { container } = render(<AppearanceSettings open={false} />)
     expect(container.firstChild).toBeNull()
   })
diff --git a/src/lib/__tests__/toolkit-fab.test.tsx b/src/lib/__tests__/toolkit-fab.test.tsx
index 58e19710..0806d374 100644
--- a/src/lib/__tests__/toolkit-fab.test.tsx
+++ b/src/lib/__tests__/toolkit-fab.test.tsx
@@ -156,7 +156,7 @@ describe("ToolkitFAB", () => {
     fireEvent.click(screen.getByRole("button", { name: "Open menu" }))
     expect(screen.queryByText("Ontology")).not.toBeInTheDocument()
     expect(screen.queryByText("Reviews")).not.toBeInTheDocument()
-    expect(screen.queryByText("Settings")).not.toBeInTheDocument()
+    expect(screen.queryByText("Admin")).not.toBeInTheDocument()
   })
 
   it("admin actions are present when isAdmin=true", async () => {
@@ -166,7 +166,7 @@ describe("ToolkitFAB", () => {
 
     fireEvent.click(screen.getByRole("button", { name: "Open menu" }))
     expect(screen.getByText("Ontology")).toBeInTheDocument()
-    expect(screen.getByText("Settings")).toBeInTheDocument()
+    expect(screen.getByText("Admin")).toBeInTheDocument()
     // Reviews label (no pending count)
     expect(screen.getByText("Reviews")).toBeInTheDocument()
   })
@@ -190,15 +190,15 @@ describe("ToolkitFAB", () => {
     expect(screen.getByText("2.5k sats")).toBeInTheDocument()
   })
 
-  it("Settings button navigates to /settings via router.push (not openModal)", async () => {
+  it("Admin button navigates to /admin via router.push (not openModal)", async () => {
     userState.isAdmin = true
     const { ToolkitFAB } = await import("@/components/layout/toolkit")
     render(<ToolkitFAB {...defaultProps} />)
 
     fireEvent.click(screen.getByRole("button", { name: "Open menu" }))
-    fireEvent.click(screen.getByText("Settings"))
+    fireEvent.click(screen.getByText("Admin"))
 
-    expect(mockPush).toHaveBeenCalledWith("/settings")
+    expect(mockPush).toHaveBeenCalledWith("/admin")
     // must NOT call openModal for settings
     expect(modalOpen).not.toHaveBeenCalledWith("settings")
   })
@@ -216,15 +216,15 @@ describe("Toolkit (desktop strip)", () => {
     expect(root?.className).toContain("sm:flex")
   })
 
-  it("Settings button in desktop toolbar navigates to /settings via router.push", async () => {
+  it("Admin button in desktop toolbar navigates to /admin via router.push", async () => {
     userState.isAdmin = true
     const { Toolkit } = await import("@/components/layout/toolkit")
     render(<Toolkit {...defaultProps} />)
 
-    const settingsBtn = screen.getByRole("button", { name: "Settings" })
-    fireEvent.click(settingsBtn)
+    const adminBtn = screen.getByRole("button", { name: "Admin" })
+    fireEvent.click(adminBtn)
 
-    expect(mockPush).toHaveBeenCalledWith("/settings")
+    expect(mockPush).toHaveBeenCalledWith("/admin")
     expect(modalOpen).not.toHaveBeenCalledWith("settings")
   })
 })
diff --git a/src/lib/__tests__/type-editor.test.tsx b/src/lib/__tests__/type-editor.test.tsx
index 4bf61d04..497b1c16 100644
--- a/src/lib/__tests__/type-editor.test.tsx
+++ b/src/lib/__tests__/type-editor.test.tsx
@@ -1,8 +1,8 @@
 import { describe, it, expect, vi } from "vitest"
 import { render, screen } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
-import { TypeEditor } from "@/app/ontology/type-editor"
-import type { SchemaNode, SchemaEdge } from "@/app/ontology/page"
+import { TypeEditor } from "@/app/admin/ontology/type-editor"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 
 const baseSchema: SchemaNode = {
   ref_id: "s-1",
diff --git a/src/lib/node-display.ts b/src/lib/node-display.ts
index 70f1e885..58764573 100644
--- a/src/lib/node-display.ts
+++ b/src/lib/node-display.ts
@@ -1,5 +1,5 @@
 import type { GraphNode } from "./graph-api"
-import type { SchemaNode } from "@/app/ontology/page"
+import type { SchemaNode } from "@/lib/schema-types"
 
 export const TITLE_MAX_LEN = 120
 
diff --git a/src/lib/node-remap.ts b/src/lib/node-remap.ts
index 5a0755a7..e3a9c61c 100644
--- a/src/lib/node-remap.ts
+++ b/src/lib/node-remap.ts
@@ -1,4 +1,4 @@
-import type { SchemaAttribute } from "@/app/ontology/page"
+import type { SchemaAttribute } from "@/lib/schema-types"
 
 // ---------------------------------------------------------------------------
 // Jaro-Winkler string similarity — no external dependency
diff --git a/src/lib/node-schema-utils.ts b/src/lib/node-schema-utils.ts
index fa8d46f1..c19efe7d 100644
--- a/src/lib/node-schema-utils.ts
+++ b/src/lib/node-schema-utils.ts
@@ -1,4 +1,4 @@
-import type { SchemaNode, SchemaAttribute } from "@/app/ontology/page"
+import type { SchemaNode, SchemaAttribute } from "@/lib/schema-types"
 
 // Backend book-keeping attributes that are never user-facing.
 // owner_reference_id is set from the LSAT, weight/is_muted are
diff --git a/src/lib/schema-types.ts b/src/lib/schema-types.ts
new file mode 100644
index 00000000..fec04db7
--- /dev/null
+++ b/src/lib/schema-types.ts
@@ -0,0 +1,46 @@
+// Shared schema/ontology types. These describe the nodes and edges of the
+// graph's schema (the ontology), and are consumed across stores, components,
+// and lib helpers — independent of any particular route.
+
+export interface SchemaAttribute {
+  key: string
+  type: string
+  required: boolean
+}
+
+export interface SchemaNode {
+  ref_id: string
+  type: string
+  parent: string
+  color: string
+  node_key: string
+  // The search domain this schema belongs to (lowercased). Domains are derived
+  // backend-side from `DISTINCT toLower(s.domain)`; a root type only registers as
+  // its own domain when this is set to its name. Omitted → backend defaults to
+  // "entity". Set explicitly by the Domains editor; left unset by the ontology editor.
+  domain?: string
+  attributes: SchemaAttribute[]
+  inherited_attributes?: SchemaAttribute[]
+  title_key?: string
+  index?: string
+  description_key?: string
+  icon?: string
+  secondary_color?: string
+  paid_properties?: string[]
+}
+
+export interface SchemaEdge {
+  ref_id: string
+  // `source`/`target` are the connected schema NODES' ref_ids (used to lay out
+  // the ontology graph), NOT type names. Use `source_type`/`target_type` to
+  // match against a node's node_type.
+  source: string
+  target: string
+  edge_type: string
+  source_type?: string
+  target_type?: string
+  // Attribute definitions for this edge type, e.g. { since: "?datetime",
+  // role: "string" }. A leading "?" marks the attribute optional. Present on
+  // the live /schema/all payload; absent on some mock fixtures.
+  attributes?: Record<string, string>
+}
diff --git a/src/stores/schema-store.ts b/src/stores/schema-store.ts
index 381c145b..245531a1 100644
--- a/src/stores/schema-store.ts
+++ b/src/stores/schema-store.ts
@@ -1,7 +1,7 @@
 "use client"
 
 import { create } from "zustand"
-import type { SchemaNode, SchemaEdge } from "@/app/ontology/page"
+import type { SchemaNode, SchemaEdge } from "@/lib/schema-types"
 import { api } from "@/lib/api"
 import { isMocksEnabled } from "@/lib/mock-data"
 
diff --git a/vitest.config.ts b/vitest.config.ts
index 78e24a7d..f4214ca6 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig, configDefaults } from "vitest/config"
 import react from "@vitejs/plugin-react"
 import path from "path"
 
@@ -8,6 +8,9 @@ export default defineConfig({
     environment: "jsdom",
     globals: true,
     setupFiles: ["./src/lib/__tests__/setup.ts"],
+    // Never scan transient git worktrees (e.g. .claude/worktrees/*), which
+    // hold checkouts of other branches and would run stale duplicate tests.
+    exclude: [...configDefaults.exclude, "**/.claude/**"],
   },
   resolve: {
     alias: {