dineway 0.1.9 → 0.1.12

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "dineway",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "description": "Agentic Website builder for restaurants — structured content meets AI via the Model Context Protocol",
   "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "dist/index.mjs",
   "types": "dist/index.d.mts",
   "bin": {
@@ -11,7 +14,6 @@
   "files": [
     "dist",
     "locals.d.ts",
-    "src/astro/routes",
     "src/ui.ts",
     "src/components"
   ],
@@ -41,12 +43,24 @@
       "default": "./dist/astro/middleware/redirect.mjs"
     },
     "./ui": "./src/ui.ts",
+    "./ui/server-runtime": {
+      "types": "./dist/ui/server-runtime.d.mts",
+      "default": "./dist/ui/server-runtime.mjs"
+    },
+    "./ui/client-runtime": {
+      "types": "./dist/ui/client-runtime.d.mts",
+      "default": "./dist/ui/client-runtime.mjs"
+    },
     "./ui/search": "./src/components/LiveSearch.astro",
     "./cli": {
       "types": "./dist/cli/index.d.mts",
       "default": "./dist/cli/index.mjs"
     },
-    "./routes/*": "./src/astro/routes/*",
+    "./routes/PluginRegistry": {
+      "types": "./dist/astro/routes/PluginRegistry.d.mts",
+      "default": "./dist/astro/routes/PluginRegistry.mjs"
+    },
+    "./routes/*": "./dist/astro/routes/*",
     "./db": {
       "types": "./dist/db/index.d.mts",
       "default": "./dist/db/index.mjs"
@@ -110,6 +124,22 @@
       "types": "./dist/client/external-auth-headers.d.mts",
       "default": "./dist/client/external-auth-headers.mjs"
     },
+    "./auth/providers/github": {
+      "types": "./dist/auth/providers/github.d.mts",
+      "default": "./dist/auth/providers/github.mjs"
+    },
+    "./auth/providers/github-admin": {
+      "types": "./dist/auth/providers/github-admin.d.mts",
+      "default": "./dist/auth/providers/github-admin.mjs"
+    },
+    "./auth/providers/google": {
+      "types": "./dist/auth/providers/google.d.mts",
+      "default": "./dist/auth/providers/google.mjs"
+    },
+    "./auth/providers/google-admin": {
+      "types": "./dist/auth/providers/google-admin.d.mts",
+      "default": "./dist/auth/providers/google-admin.mjs"
+    },
     "./seo": {
       "types": "./dist/seo/index.d.mts",
       "default": "./dist/seo/index.mjs"
@@ -122,6 +152,18 @@
       "types": "./dist/plugin-utils.d.mts",
       "default": "./dist/plugin-utils.mjs"
     },
+    "./api/route-utils": {
+      "types": "./dist/api/route-utils.d.mts",
+      "default": "./dist/api/route-utils.mjs"
+    },
+    "./api/schemas": {
+      "types": "./dist/api/schemas/index.d.mts",
+      "default": "./dist/api/schemas/index.mjs"
+    },
+    "./api/schemas/setup": {
+      "types": "./dist/api/schemas/setup.d.mts",
+      "default": "./dist/api/schemas/setup.mjs"
+    },
     "./plugins/adapt-sandbox-entry": {
       "types": "./dist/plugins/adapt-sandbox-entry.d.mts",
       "default": "./dist/plugins/adapt-sandbox-entry.mjs"
@@ -150,6 +192,7 @@
     "#media/*": "./src/media/*",
     "#mcp/*": "./src/mcp/*",
     "#comments/*": "./src/comments/*",
+    "#config/*": "./src/config/*",
     "#site-context/*": "./src/site-context/*",
     "#types": "./src/astro/types.js"
   },
@@ -167,6 +210,27 @@
       "client/external-auth-headers": [
         "dist/client/external-auth-headers.d.mts"
       ],
+      "api/route-utils": [
+        "dist/api/route-utils.d.mts"
+      ],
+      "api/schemas": [
+        "dist/api/schemas/index.d.mts"
+      ],
+      "api/schemas/setup": [
+        "dist/api/schemas/setup.d.mts"
+      ],
+      "auth/providers/github": [
+        "dist/auth/providers/github.d.mts"
+      ],
+      "auth/providers/github-admin": [
+        "dist/auth/providers/github-admin.d.mts"
+      ],
+      "auth/providers/google": [
+        "dist/auth/providers/google.d.mts"
+      ],
+      "auth/providers/google-admin": [
+        "dist/auth/providers/google-admin.d.mts"
+      ],
       "db": [
         "dist/db/index.d.mts"
       ],
@@ -230,12 +294,19 @@
       "storage/s3": [
         "dist/storage/s3.d.mts"
       ],
+      "ui/client-runtime": [
+        "dist/ui/client-runtime.d.mts"
+      ],
+      "ui/server-runtime": [
+        "dist/ui/server-runtime.d.mts"
+      ],
       "": [
         "dist/index.d.mts"
       ]
     }
   },
   "dependencies": {
+    "@cloudflare/kumo": "^1.16.0",
     "@floating-ui/react": "^0.27.16",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@portabletext/toolkit": "^5.0.1",
@@ -270,9 +341,9 @@
     "ulidx": "^2.4.1",
     "upng-js": "^2.1.0",
     "zod": "^4.3.5",
-    "@dineway-ai/auth": "0.1.8",
-    "@dineway-ai/gutenberg-to-portable-text": "0.1.7",
-    "@dineway-ai/admin": "0.1.7"
+    "@dineway-ai/admin": "0.1.9",
+    "@dineway-ai/auth": "0.1.10",
+    "@dineway-ai/gutenberg-to-portable-text": "0.1.9"
   },
   "optionalDependencies": {
     "@libsql/kysely-libsql": "^0.4.0",
@@ -280,8 +351,6 @@
   },
   "peerDependencies": {
     "@astrojs/react": ">=5.0.0-beta.0",
-    "@tanstack/react-query": ">=5.0.0",
-    "@tanstack/react-router": ">=1.100.0",
     "astro": ">=6.0.0-beta.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0"
@@ -293,6 +362,7 @@
     "@rivet-dev/agent-os-core": "^0.1.1",
     "@types/better-sqlite3": "^7.6.12",
     "@types/pg": "^8.16.0",
+    "@types/react": "19.2.14",
     "@types/sanitize-html": "^2.16.0",
     "@types/sax": "^1.2.7",
     "@vitest/ui": "^4.0.17",
@@ -302,7 +372,7 @@
     "vite": "^6.0.0",
     "vitest": "^4.0.18",
     "zod-openapi": "^5.4.6",
-    "@dineway-ai/blocks": "0.1.7"
+    "@dineway-ai/blocks": "0.1.9"
   },
   "keywords": [
     "astro",
@@ -312,10 +382,10 @@
     "content",
     "cms"
   ],
-  "author": "Matt Kane",
+  "author": "Dineway",
   "license": "MIT",
   "scripts": {
-    "build": "tsdown",
+    "build": "tsdown && node scripts/copy-route-assets.mjs",
     "dev": "tsdown --watch",
     "typecheck": "tsgo --noEmit",
     "check": "publint && attw --pack --ignore-rules=cjs-resolves-to-esm --ignore-rules=no-resolution --ignore-rules=internal-resolution-error",

package/src/components/Button.astro

@@ -1,5 +1,5 @@
 ---
-import { sanitizeHref } from "../utils/url.js";
+import { sanitizeHref } from "dineway/ui/server-runtime";
 
 /**
  * Portable Text Button block component

package/src/components/CommentForm.astro

@@ -26,7 +26,7 @@ interface Props {
 	turnstileSiteKey?: string;
 }
 
-import { getCollectionInfo } from "../schema/query.js";
+import { getCollectionInfo } from "dineway/ui/server-runtime";
 
 const {
 	collection,

package/src/components/Comments.astro

@@ -13,9 +13,7 @@
  * <Comments collection="posts" contentId={post.id} threaded />
  * ```
  */
-import type { PublicComment } from "../database/repositories/comment.js";
-import { getComments } from "../comments/query.js";
-import { getCollectionInfo } from "../schema/query.js";
+import { getCollectionInfo, getComments, type PublicComment } from "dineway/ui/server-runtime";
 
 interface Props {
 	collection: string;

package/src/components/DinewayBodyEnd.astro

@@ -10,9 +10,11 @@
  * </body>
  * ```
  */
-import type { PublicPageContext } from "../plugins/types.js";
-import { renderFragments } from "../page/fragments.js";
-import { getPageRuntime } from "../page/index.js";
+import {
+	getPageRuntime,
+	renderFragments,
+	type PublicPageContext,
+} from "dineway/ui/server-runtime";
 
 interface Props {
 	page: PublicPageContext;

package/src/components/DinewayBodyStart.astro

@@ -10,9 +10,11 @@
  * </body>
  * ```
  */
-import type { PublicPageContext } from "../plugins/types.js";
-import { renderFragments } from "../page/fragments.js";
-import { getPageRuntime } from "../page/index.js";
+import {
+	getPageRuntime,
+	renderFragments,
+	type PublicPageContext,
+} from "dineway/ui/server-runtime";
 
 interface Props {
 	page: PublicPageContext;

package/src/components/DinewayHead.astro

@@ -13,15 +13,18 @@
  * </head>
  * ```
  */
-import type { PublicPageContext, PageMetadataContribution } from "../plugins/types.js";
-import { resolvePageMetadata, renderPageMetadata } from "../page/metadata.js";
-import { renderFragments } from "../page/fragments.js";
 import {
 	generateBaseSeoContributions,
 	generateSiteSeoContributions,
-} from "../page/seo-contributions.js";
-import { getPageRuntime } from "../page/index.js";
-import { getSiteSetting } from "../settings/index.js";
+	getPageRuntime,
+	getSiteSettings,
+	renderFragments,
+	renderPageMetadata,
+	renderSiteIdentity,
+	resolvePageMetadata,
+	type PageMetadataContribution,
+	type PublicPageContext,
+} from "dineway/ui/server-runtime";
 
 interface Props {
 	page: PublicPageContext;
@@ -34,21 +37,23 @@ const runtime = getPageRuntime(Astro.locals as Record<string, unknown>);
 const baseContributions: PageMetadataContribution[] = generateBaseSeoContributions(page);
 
 let metadataHtml = "";
+let siteIdentityHtml = "";
 let fragmentsHtml = "";
 
 if (runtime) {
 	// Plugin contributions come BEFORE site/base, so resolvePageMetadata's
 	// first-wins dedup lets plugins override defaults.
-	const [seoSettings, pluginContributions, fragments] = await Promise.all([
-		getSiteSetting("seo"),
+	const [siteSettings, pluginContributions, fragments] = await Promise.all([
+		getSiteSettings(),
 		runtime.collectPageMetadata(page),
 		runtime.collectPageFragments(page),
 	]);
 
-	const siteContributions = generateSiteSeoContributions(seoSettings);
+	const siteContributions = generateSiteSeoContributions(siteSettings.seo);
 	const allContributions = [...pluginContributions, ...siteContributions, ...baseContributions];
 	const resolved = resolvePageMetadata(allContributions);
 	metadataHtml = renderPageMetadata(resolved);
+	siteIdentityHtml = renderSiteIdentity({ favicon: siteSettings.favicon });
 	fragmentsHtml = renderFragments(fragments, "head");
 } else {
 	// No runtime (Dineway not initialized) — still render base SEO
@@ -58,4 +63,5 @@ if (runtime) {
 ---
 
 <Fragment set:html={metadataHtml} />
+<Fragment set:html={siteIdentityHtml} />
 <Fragment set:html={fragmentsHtml} />

package/src/components/DinewayImage.astro

@@ -16,10 +16,13 @@
  * <Image image={post.data.featured_image} class="hero" />
  * ```
  */
-import type { MediaValue } from "../fields/types.js";
 import type { HTMLAttributes } from "astro/types";
-import type { ImageEmbed } from "../media/types.js";
-import { getMediaProvider } from "../media/provider-loader.js";
+import {
+	buildRenderMediaUrl,
+	getMediaProvider,
+	type ImageEmbed,
+	type MediaValue,
+} from "dineway/ui/server-runtime";
 // Standard responsive breakpoints
 const BREAKPOINTS = [640, 750, 828, 960, 1080, 1280, 1600, 1920];
 
@@ -57,10 +60,11 @@ function normalizeImage(
  */
 function buildLocalImageUrl(img: MediaValue): string {
 	const storageKey = (img.meta?.storageKey as string) || img.id;
-	if (storageKey) {
-		return `/_dineway/api/media/file/${storageKey}`;
-	}
-	return "";
+	return buildRenderMediaUrl(Astro.locals.dineway?.getPublicMediaUrl, {
+		storageKey,
+		url: img.src,
+		id: img.id,
+	});
 }
 
 /**
@@ -98,7 +102,7 @@ if (img) {
 
 	if (providerId === "local" || img.src) {
 		// Local provider or direct src URL
-		src = img.src || buildLocalImageUrl(img);
+		src = buildLocalImageUrl(img);
 	} else {
 		// External provider
 		try {

package/src/components/DinewayMedia.astro

@@ -16,10 +16,14 @@
  * <Media value={post.data.hero} width={1200} height={630} />
  * ```
  */
-import type { MediaValue } from "../fields/types.js";
-import type { EmbedResult, EmbedOptions } from "../media/types.js";
 import type { HTMLAttributes } from "astro/types";
-import { getMediaProvider } from "../media/provider-loader.js";
+import {
+	buildRenderMediaUrl,
+	getMediaProvider,
+	type EmbedOptions,
+	type EmbedResult,
+	type MediaValue,
+} from "dineway/ui/server-runtime";
 
 interface Props extends Omit<HTMLAttributes<"img" | "video" | "audio">, "src" | "width" | "height"> {
 	/** Media value from content field */
@@ -77,11 +81,16 @@ if (media) {
 		// Fallback for local provider without runtime
 		const storageKey = (media.meta?.storageKey as string) || media.id;
 		if (storageKey) {
+			const src = buildRenderMediaUrl(Astro.locals.dineway?.getPublicMediaUrl, {
+				storageKey,
+				url: media.src,
+				id: media.id,
+			});
 			const mimeType = media.mimeType || "";
 			if (mimeType.startsWith("video/")) {
 				embed = {
 					type: "video",
-					src: `/_dineway/api/media/file/${storageKey}`,
+					src,
 					width: media.width,
 					height: media.height,
 					controls: true,
@@ -90,14 +99,14 @@ if (media) {
 			} else if (mimeType.startsWith("audio/")) {
 				embed = {
 					type: "audio",
-					src: `/_dineway/api/media/file/${storageKey}`,
+					src,
 					controls: true,
 					preload: "metadata",
 				};
 			} else {
 				embed = {
 					type: "image",
-					src: `/_dineway/api/media/file/${storageKey}`,
+					src,
 					width: media.width,
 					height: media.height,
 					alt: media.alt,

package/src/components/Embed.astro

@@ -1,6 +1,5 @@
 ---
-import { sanitizeHref } from "../utils/url.js";
-import { sanitizeContent } from "../utils/sanitize.js";
+import { sanitizeContent, sanitizeHref } from "dineway/ui/server-runtime";
 
 /**
  * Portable Text Embed block component

package/src/components/File.astro

@@ -1,5 +1,5 @@
 ---
-import { sanitizeHref } from "../utils/url.js";
+import { sanitizeHref } from "dineway/ui/server-runtime";
 
 /**
  * Portable Text File block component

package/src/components/Gallery.astro

@@ -6,6 +6,7 @@
  * Uses Astro's Image component for optimization when dimensions are available.
  */
 import { Image as AstroImage } from "astro:assets";
+import { buildRenderMediaUrl } from "dineway/ui/server-runtime";
 
 export interface Props {
 	node: {
@@ -39,9 +40,10 @@ if (!images.length) {
 <div class="dineway-gallery" style={`--columns: ${columns}`}>
 	{
 		images.map((image) => {
-			const src =
-				image.asset.url ||
-				`/_dineway/api/media/file/${image.asset._ref}`;
+			const src = buildRenderMediaUrl(Astro.locals.dineway?.getPublicMediaUrl, {
+				url: image.asset.url,
+				id: image.asset._ref,
+			});
 			const hasSize = image.width && image.height;
 			return (
 				<figure class="dineway-gallery-item">

package/src/components/HtmlBlock.astro

@@ -5,7 +5,7 @@
  * Renders raw HTML blocks that couldn't be converted to Portable Text.
  * Sanitizes HTML to prevent XSS attacks.
  */
-import { sanitizeContent } from "../utils/sanitize.js";
+import { sanitizeContent } from "dineway/ui/server-runtime";
 
 export interface Props {
 	node: {

package/src/components/Image.astro

@@ -5,8 +5,11 @@
  * Renders image blocks from WordPress imports and Dineway media.
  * Uses the provider's getSrc function for responsive srcset generation.
  */
-import type { ImageEmbed } from "../media/types.js";
-import { getMediaProvider } from "../media/provider-loader.js";
+import {
+	buildRenderMediaUrl,
+	getMediaProvider,
+	type ImageEmbed,
+} from "dineway/ui/server-runtime";
 // Standard responsive breakpoints
 const BREAKPOINTS = [640, 750, 828, 960, 1080, 1280, 1600, 1920];
 
@@ -125,7 +128,10 @@ if (providerId && providerId !== "local") {
 // Fallback for local provider — prefer stored URL (includes storage key with extension),
 // fall back to _ref (bare ULID, works if media file endpoint supports ID lookup)
 if (!src) {
-	src = asset.url || `/_dineway/api/media/file/${asset._ref}`;
+	src = buildRenderMediaUrl(Astro.locals.dineway?.getPublicMediaUrl, {
+		url: asset.url,
+		id: asset._ref,
+	});
 }
 
 // Build placeholder background style

package/src/components/InlinePortableTextEditor.tsx

@@ -10,7 +10,7 @@
  */
 
 import { autoUpdate, flip, offset, shift, useFloating } from "@floating-ui/react";
-import { Extension, type JSONContent, type Range } from "@tiptap/core";
+import { Extension, Node, mergeAttributes, type JSONContent, type Range } from "@tiptap/core";
 import Focus from "@tiptap/extension-focus";
 import Image from "@tiptap/extension-image";
 import Link from "@tiptap/extension-link";
@@ -25,7 +25,7 @@ import Suggestion from "@tiptap/suggestion";
 import * as React from "react";
 import { createPortal } from "react-dom";
 
-import { computeThumbnailSize } from "../media/thumbnail.js";
+import { computeThumbnailSize } from "dineway/ui/client-runtime";
 
 // ── Portable Text types ────────────────────────────────────────────
 
@@ -202,12 +202,15 @@ function convertPMNode(node: PMNode): PTBlock | PTBlock[] | null {
 		}
 		case "horizontalRule":
 			return { _type: "break", _key: k(), style: "lineBreak" };
-		case "pluginBlock":
+		case "pluginBlock": {
+			const { blockType, id, data } = node.attrs ?? {};
 			return {
-				_type: attrStr(node.attrs, "blockType") || "embed",
+				...(data && typeof data === "object" ? data : {}),
+				_type: typeof blockType === "string" ? blockType : "embed",
 				_key: k(),
-				id: attrStr(node.attrs, "id"),
+				id: typeof id === "string" ? id : "",
 			};
+		}
 		default:
 			return null;
 	}
@@ -412,21 +415,27 @@ function convertPTBlock(block: PTBlock): JSONContent | null {
 			},
 		};
 	}
-	// Unknown block types — treat as plugin blocks if they have an id
-	const embedBlock = block as { _type: string; url?: string; id?: string };
-	if (embedBlock.id || embedBlock.url) {
-		return {
-			type: "pluginBlock",
-			attrs: {
-				blockType: block._type,
-				id: embedBlock.id || embedBlock.url || "",
-			},
-		};
-	}
-	// Truly unknown — render as code-marked text
 	return {
-		type: "paragraph",
-		content: [{ type: "text", text: `[${block._type}]`, marks: [{ type: "code" }] }],
+		type: "pluginBlock",
+		attrs: buildPluginBlockAttrs(block),
+	};
+}
+
+function buildPluginBlockAttrs(block: PTBlock): {
+	blockType: string;
+	id: string;
+	data: Record<string, unknown>;
+} {
+	const id = block.id;
+	const url = block.url;
+	return {
+		blockType: typeof block._type === "string" ? block._type : "embed",
+		id: typeof id === "string" ? id : typeof url === "string" ? url : "",
+		data: Object.fromEntries(
+			Object.entries(block).filter(
+				([key]) => !key.startsWith("_") && key !== "id" && key !== "url",
+			),
+		),
 	};
 }
 
@@ -505,6 +514,42 @@ function convertPTMarks(marks: string[], markDefs: Map<string, PTMarkDef>): Mark
 	return pm;
 }
 
+const pluginBlockExtension = Node.create({
+	name: "pluginBlock",
+	group: "block",
+	atom: true,
+	selectable: true,
+	draggable: true,
+
+	addAttributes() {
+		const noDom = { rendered: false, parseHTML: () => null };
+		return {
+			blockType: { default: "", ...noDom },
+			id: { default: "", ...noDom },
+			data: { default: {}, ...noDom },
+		};
+	},
+
+	parseHTML() {
+		return [{ tag: 'div[data-dineway-plugin-block="true"]' }];
+	},
+
+	renderHTML({ HTMLAttributes, node }) {
+		const blockType = typeof node.attrs.blockType === "string" ? node.attrs.blockType : "";
+		const label = blockType || "Block";
+		return [
+			"div",
+			mergeAttributes(HTMLAttributes, {
+				"data-dineway-plugin-block": "true",
+				"data-block-type": blockType,
+				class: "dineway-plugin-block-placeholder",
+				contenteditable: "false",
+			}),
+			`Plugin block: ${label} (edit in admin)`,
+		];
+	},
+});
+
 // ── Inline BubbleMenu ──────────────────────────────────────────────
 
 function InlineBubbleMenu({ editor }: { editor: Editor }) {
@@ -1734,6 +1779,7 @@ export function InlinePortableTextEditor({
 				mode: "all",
 			}),
 			Typography,
+			pluginBlockExtension,
 			slashCommandsExtension,
 		],
 		content: initialContent,
@@ -1795,7 +1841,7 @@ export function InlinePortableTextEditor({
 			// Don't save if focus moved to the slash menu (portalled to body)
 			if (related?.closest(".dineway-slash-menu")) return;
 			if (related?.closest(".dineway-media-picker")) return;
-			save();
+			void save();
 		},
 		[save, mediaPickerOpen],
 	);
@@ -1935,3 +1981,6 @@ export function InlinePortableTextEditor({
 		</div>
 	);
 }
+
+export { pmToPortableText as _pmToPortableText };
+export { portableTextToPM as _portableTextToPM };

package/src/components/PortableText.astro

@@ -17,7 +17,7 @@ import {
 	mergeComponents,
 	type PortableTextProps,
 } from "astro-portabletext";
-import { getEditMeta } from "../query.js";
+import { getEditMeta } from "dineway/ui/server-runtime";
 // @ts-ignore - virtual module
 import { pluginBlockComponents } from "virtual:dineway/block-components";
 import { dinewayComponents } from "./index.js";

package/src/components/WidgetArea.astro

@@ -1,5 +1,5 @@
 ---
-import { getWidgetArea } from "../widgets/index.js";
+import { getWidgetArea } from "dineway/ui/server-runtime";
 import WidgetRenderer from "./WidgetRenderer.astro";
 
 interface Props {

package/src/components/WidgetRenderer.astro

@@ -1,7 +1,5 @@
 ---
-import type { Widget } from "../widgets/types.js";
-import { getMenu } from "../menus/index.js";
-import { sanitizeHref } from "../utils/url.js";
+import { getMenu, sanitizeHref, type Widget } from "dineway/ui/server-runtime";
 import PortableText from "./PortableText.astro";
 import RecentPosts from "./widgets/RecentPosts.astro";
 import Categories from "./widgets/Categories.astro";

package/src/components/marks/Link.astro

@@ -1,5 +1,5 @@
 ---
-import { sanitizeHref } from "../../utils/url.js";
+import { sanitizeHref } from "dineway/ui/server-runtime";
 
 /**
  * Portable Text Link mark component