@btst/stack 2.3.0 → 2.5.0

package/dist/packages/stack/src/plugins/ai-chat/client/components/chat-layout.mjs

@@ -1,27 +1,37 @@
 "use client";
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useCallback } from 'react';
 import { Button } from '../../../../../../ui/src/components/button.mjs';
+import { Badge } from '../../../../../../ui/src/components/badge.mjs';
 import { Sheet, SheetTrigger, SheetContent } from '../../../../../../ui/src/components/sheet.mjs';
-import { Menu, PanelLeftClose, PanelLeft } from 'lucide-react';
+import { Sparkles, Trash2, X, Menu, PanelLeftClose, PanelLeft } from 'lucide-react';
 import { cn } from '../../../../../../ui/src/lib/utils.mjs';
 import { ChatSidebar } from './chat-sidebar.mjs';
 import { ChatInterface } from './chat-interface.mjs';
+import { usePageAIContext } from '../../../../../../../plugins/ai-chat/client/context/page-ai-context.mjs';
 
-function ChatLayout({
-  apiBaseURL,
-  apiBasePath,
-  conversationId,
-  layout = "full",
-  className,
-  showSidebar = true,
-  widgetHeight = "600px",
-  initialMessages,
-  onMessagesChange
-}) {
+function ChatLayout(props) {
+  const {
+    apiBaseURL,
+    apiBasePath,
+    conversationId,
+    layout = "full",
+    className,
+    showSidebar = true,
+    initialMessages,
+    onMessagesChange
+  } = props;
+  const widgetHeight = props.layout === "widget" ? props.widgetHeight ?? "600px" : "600px";
+  const widgetWidth = props.layout === "widget" ? props.widgetWidth ?? "380px" : "380px";
+  const defaultOpen = props.layout === "widget" ? props.defaultOpen ?? false : false;
+  const showTrigger = props.layout === "widget" ? props.showTrigger ?? true : true;
   const [sidebarOpen, setSidebarOpen] = useState(true);
   const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false);
   const [chatResetKey, setChatResetKey] = useState(0);
+  const [widgetOpen, setWidgetOpen] = useState(defaultOpen);
+  const [widgetResetKey, setWidgetResetKey] = useState(0);
+  const [widgetEverOpened, setWidgetEverOpened] = useState(defaultOpen);
+  const pageAIContext = usePageAIContext();
   const apiPath = `${apiBaseURL}${apiBasePath}/chat`;
   const handleNewChat = useCallback(() => {
     if (!conversationId) {
@@ -29,26 +39,81 @@ function ChatLayout({
     }
   }, [conversationId]);
   if (layout === "widget") {
-    return /* @__PURE__ */ jsx(
-      "div",
-      {
-        className: cn(
-          "flex flex-col w-full border rounded-xl overflow-hidden bg-background shadow-sm",
-          className
-        ),
-        style: { height: widgetHeight },
-        children: /* @__PURE__ */ jsx(
-          ChatInterface,
-          {
-            apiPath,
-            id: conversationId,
-            variant: "widget",
-            initialMessages,
-            onMessagesChange
-          }
-        )
-      }
-    );
+    return /* @__PURE__ */ jsxs("div", { className: cn("flex flex-col items-end gap-3", className), children: [
+      /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: cn(
+            "flex flex-col border rounded-xl overflow-hidden bg-background shadow-xl",
+            widgetOpen ? "flex" : "hidden"
+          ),
+          style: { height: widgetHeight, width: widgetWidth },
+          children: [
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5 px-3 py-1.5 border-b bg-muted/40", children: [
+              /* @__PURE__ */ jsx(Sparkles, { className: "h-3 w-3 text-muted-foreground" }),
+              pageAIContext ? /* @__PURE__ */ jsx(
+                Badge,
+                {
+                  variant: "secondary",
+                  className: "text-xs",
+                  "data-testid": "page-context-badge",
+                  children: pageAIContext.routeName
+                }
+              ) : /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground font-medium", children: "AI Chat" }),
+              /* @__PURE__ */ jsx("div", { className: "flex-1" }),
+              /* @__PURE__ */ jsx(
+                Button,
+                {
+                  variant: "ghost",
+                  size: "icon",
+                  className: "h-5 w-5",
+                  onClick: () => setWidgetResetKey((prev) => prev + 1),
+                  "aria-label": "Clear chat",
+                  title: "Clear chat",
+                  children: /* @__PURE__ */ jsx(Trash2, { className: "h-3.5 w-3.5" })
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                Button,
+                {
+                  variant: "ghost",
+                  size: "icon",
+                  className: "h-5 w-5",
+                  onClick: () => setWidgetOpen(false),
+                  "aria-label": "Close chat",
+                  children: /* @__PURE__ */ jsx(X, { className: "h-3.5 w-3.5" })
+                }
+              )
+            ] }),
+            widgetEverOpened && /* @__PURE__ */ jsx(
+              ChatInterface,
+              {
+                apiPath,
+                id: conversationId,
+                variant: "widget",
+                initialMessages,
+                onMessagesChange
+              },
+              `widget-${conversationId ?? "new"}-${widgetResetKey}`
+            )
+          ]
+        }
+      ),
+      showTrigger && /* @__PURE__ */ jsx(
+        Button,
+        {
+          size: "icon",
+          className: "h-12 w-12 rounded-full shadow-lg",
+          onClick: () => {
+            setWidgetOpen((prev) => !prev);
+            setWidgetEverOpened(true);
+          },
+          "aria-label": widgetOpen ? "Close chat" : "Open chat",
+          "data-testid": "widget-trigger",
+          children: widgetOpen ? /* @__PURE__ */ jsx(X, { className: "h-5 w-5" }) : /* @__PURE__ */ jsx(Sparkles, { className: "h-5 w-5" })
+        }
+      )
+    ] });
   }
   return /* @__PURE__ */ jsxs(
     "div",
@@ -77,7 +142,7 @@ function ChatLayout({
           }
         ),
         /* @__PURE__ */ jsxs("div", { className: "flex-1 flex flex-col min-w-0", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 p-2 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 p-2 border-b bg-background/95 backdrop-blur supports-backdrop-filter:bg-background/60", children: [
             showSidebar && /* @__PURE__ */ jsxs(Sheet, { open: mobileSidebarOpen, onOpenChange: setMobileSidebarOpen, children: [
               /* @__PURE__ */ jsx(SheetTrigger, { asChild: true, children: /* @__PURE__ */ jsx(
                 Button,
@@ -111,7 +176,19 @@ function ChatLayout({
                 children: sidebarOpen ? /* @__PURE__ */ jsx(PanelLeftClose, { className: "h-5 w-5" }) : /* @__PURE__ */ jsx(PanelLeft, { className: "h-5 w-5" })
               }
             ),
-            /* @__PURE__ */ jsx("div", { className: "flex-1" })
+            /* @__PURE__ */ jsx("div", { className: "flex-1" }),
+            pageAIContext && /* @__PURE__ */ jsxs(
+              Badge,
+              {
+                variant: "secondary",
+                className: "text-xs gap-1 mr-2",
+                "data-testid": "page-context-badge",
+                children: [
+                  /* @__PURE__ */ jsx(Sparkles, { className: "h-3 w-3" }),
+                  pageAIContext.routeName
+                ]
+              }
+            )
           ] }),
           /* @__PURE__ */ jsx(
             ChatInterface,

package/dist/packages/stack/src/plugins/ai-chat/client/components/chat-sidebar.cjs

@@ -108,7 +108,7 @@ function ChatSidebar({
             ]
           }
         ) }),
-        /* @__PURE__ */ jsxRuntime.jsx(scrollArea.ScrollArea, { className: "flex-1", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2", children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.CHAT_LOADING }) : conversations.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.SIDEBAR_NO_CONVERSATIONS }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-1", children: conversations.map((conversation) => /* @__PURE__ */ jsxRuntime.jsxs(
+        /* @__PURE__ */ jsxRuntime.jsx(scrollArea.ScrollArea, { className: "flex-1 [&_[data-slot=scroll-area-viewport]>div]:!block", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2", children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.CHAT_LOADING }) : conversations.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.SIDEBAR_NO_CONVERSATIONS }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-1", children: conversations.map((conversation) => /* @__PURE__ */ jsxRuntime.jsxs(
           "div",
           {
             className: utils.cn(

package/dist/packages/stack/src/plugins/ai-chat/client/components/chat-sidebar.mjs

@@ -106,7 +106,7 @@ function ChatSidebar({
             ]
           }
         ) }),
-        /* @__PURE__ */ jsx(ScrollArea, { className: "flex-1", children: /* @__PURE__ */ jsx("div", { className: "p-2", children: isLoading ? /* @__PURE__ */ jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.CHAT_LOADING }) : conversations.length === 0 ? /* @__PURE__ */ jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.SIDEBAR_NO_CONVERSATIONS }) : /* @__PURE__ */ jsx("div", { className: "space-y-1", children: conversations.map((conversation) => /* @__PURE__ */ jsxs(
+        /* @__PURE__ */ jsx(ScrollArea, { className: "flex-1 [&_[data-slot=scroll-area-viewport]>div]:!block", children: /* @__PURE__ */ jsx("div", { className: "p-2", children: isLoading ? /* @__PURE__ */ jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.CHAT_LOADING }) : conversations.length === 0 ? /* @__PURE__ */ jsx("div", { className: "p-4 text-center text-sm text-muted-foreground", children: localization.SIDEBAR_NO_CONVERSATIONS }) : /* @__PURE__ */ jsx("div", { className: "space-y-1", children: conversations.map((conversation) => /* @__PURE__ */ jsxs(
           "div",
           {
             className: cn(

package/dist/packages/stack/src/plugins/ai-chat/client/plugin.cjs

@@ -22,10 +22,10 @@ function createConversationsLoader(config) {
       };
       try {
         if (hooks?.beforeLoadConversations) {
-          const canLoad = await hooks.beforeLoadConversations(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversations hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadConversations(context),
+            "Load prevented by beforeLoadConversations hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -38,13 +38,10 @@ function createConversationsLoader(config) {
           const conversations = queryClient.getQueryData(
             listQuery.queryKey
           ) || null;
-          const canContinue = await hooks.afterLoadConversations(
-            conversations,
-            context
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadConversations(conversations, context),
+            "Load prevented by afterLoadConversations hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversations hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
@@ -73,10 +70,10 @@ function createConversationLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadConversation) {
-          const canLoad = await hooks.beforeLoadConversation(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversation hook");
-          }
+          await client.runClientHookWithShim(
+            () => hooks.beforeLoadConversation(id, context),
+            "Load prevented by beforeLoadConversation hook"
+          );
         }
         const client$1 = client.createApiClient({
           baseURL: apiBaseURL,
@@ -91,14 +88,10 @@ function createConversationLoader(id, config) {
         ]);
         if (hooks?.afterLoadConversation) {
           const conversation = queryClient.getQueryData(conversationQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadConversation(
-            conversation,
-            id,
-            context
+          await client.runClientHookWithShim(
+            () => hooks.afterLoadConversation(conversation, id, context),
+            "Load prevented by afterLoadConversation hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversation hook");
-          }
         }
         const queryState = queryClient.getQueryState(
           conversationQuery.queryKey

package/dist/packages/stack/src/plugins/ai-chat/client/plugin.mjs

@@ -1,5 +1,5 @@
 import { jsx } from 'react/jsx-runtime';
-import { defineClientPlugin, createApiClient } from '@btst/stack/plugins/client';
+import { defineClientPlugin, runClientHookWithShim, createApiClient } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
 import { createAiChatQueryKeys } from '../../../../../../plugins/ai-chat/query-keys.mjs';
 import { ChatLayout } from './components/chat-layout.mjs';
@@ -20,10 +20,10 @@ function createConversationsLoader(config) {
       };
       try {
         if (hooks?.beforeLoadConversations) {
-          const canLoad = await hooks.beforeLoadConversations(context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversations hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadConversations(context),
+            "Load prevented by beforeLoadConversations hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -36,13 +36,10 @@ function createConversationsLoader(config) {
           const conversations = queryClient.getQueryData(
             listQuery.queryKey
           ) || null;
-          const canContinue = await hooks.afterLoadConversations(
-            conversations,
-            context
+          await runClientHookWithShim(
+            () => hooks.afterLoadConversations(conversations, context),
+            "Load prevented by afterLoadConversations hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversations hook");
-          }
         }
         const queryState = queryClient.getQueryState(listQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
@@ -71,10 +68,10 @@ function createConversationLoader(id, config) {
       };
       try {
         if (hooks?.beforeLoadConversation) {
-          const canLoad = await hooks.beforeLoadConversation(id, context);
-          if (!canLoad) {
-            throw new Error("Load prevented by beforeLoadConversation hook");
-          }
+          await runClientHookWithShim(
+            () => hooks.beforeLoadConversation(id, context),
+            "Load prevented by beforeLoadConversation hook"
+          );
         }
         const client = createApiClient({
           baseURL: apiBaseURL,
@@ -89,14 +86,10 @@ function createConversationLoader(id, config) {
         ]);
         if (hooks?.afterLoadConversation) {
           const conversation = queryClient.getQueryData(conversationQuery.queryKey) || null;
-          const canContinue = await hooks.afterLoadConversation(
-            conversation,
-            id,
-            context
+          await runClientHookWithShim(
+            () => hooks.afterLoadConversation(conversation, id, context),
+            "Load prevented by afterLoadConversation hook"
           );
-          if (canContinue === false) {
-            throw new Error("Load prevented by afterLoadConversation hook");
-          }
         }
         const queryState = queryClient.getQueryState(
           conversationQuery.queryKey

package/dist/packages/stack/src/plugins/ai-chat/schemas.cjs

@@ -34,7 +34,23 @@ const chatRequestSchema = z.z.object({
     ])
   ),
   conversationId: z.z.string().optional(),
-  model: z.z.string().optional()
+  model: z.z.string().optional(),
+  /**
+   * Description of the current page context, injected into the AI system prompt.
+   * Sent by ChatInterface when a page has registered context via useRegisterPageAIContext.
+   */
+  pageContext: z.z.string().max(16e3).optional(),
+  /**
+   * Names of client-side tools currently available on the page.
+   * The server includes matching tool schemas in the streamText call.
+   */
+  availableTools: z.z.array(z.z.string()).optional(),
+  /**
+   * The routeName registered by the page via useRegisterPageAIContext.
+   * Cross-validated server-side against each built-in tool's route allowlist
+   * to prevent a page from claiming tools intended for a different route.
+   */
+  routeName: z.z.string().optional()
 });
 
 exports.chatRequestSchema = chatRequestSchema;

package/dist/packages/stack/src/plugins/ai-chat/schemas.mjs

@@ -32,7 +32,23 @@ const chatRequestSchema = z.object({
     ])
   ),
   conversationId: z.string().optional(),
-  model: z.string().optional()
+  model: z.string().optional(),
+  /**
+   * Description of the current page context, injected into the AI system prompt.
+   * Sent by ChatInterface when a page has registered context via useRegisterPageAIContext.
+   */
+  pageContext: z.string().max(16e3).optional(),
+  /**
+   * Names of client-side tools currently available on the page.
+   * The server includes matching tool schemas in the streamText call.
+   */
+  availableTools: z.array(z.string()).optional(),
+  /**
+   * The routeName registered by the page via useRegisterPageAIContext.
+   * Cross-validated server-side against each built-in tool's route allowlist
+   * to prevent a page from claiming tools intended for a different route.
+   */
+  routeName: z.string().optional()
 });
 
 export { chatRequestSchema, createConversationSchema, updateConversationSchema };

package/dist/packages/stack/src/plugins/blog/api/plugin.cjs

@@ -3,11 +3,12 @@
 const api = require('@btst/stack/plugins/api');
 const z = require('zod');
 const db = require('../db.cjs');
-const utils = require('../utils.cjs');
+const utils$1 = require('../utils.cjs');
 const schemas = require('../schemas.cjs');
 const getters = require('./getters.cjs');
 const queryKeyDefs = require('./query-key-defs.cjs');
 const serializers = require('./serializers.cjs');
+const utils = require('../../utils.cjs');
 
 function createBlogPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -113,7 +114,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
       for (const tag of allTags) {
         tagMapBySlug.set(tag.slug, tag);
       }
-      const tagSlugs = tagsToFindOrCreate.map((tag) => utils.slugify(tag.name));
+      const tagSlugs = tagsToFindOrCreate.map((tag) => utils$1.slugify(tag.name));
       const foundTags = [];
       for (const slug of tagSlugs) {
         const tag = tagMapBySlug.get(slug);
@@ -126,7 +127,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         ...foundTags.map((tag) => tag.slug)
       ]);
       const tagsToCreate = tagsToFindOrCreate.filter(
-        (tag) => !existingSlugs.has(utils.slugify(tag.name))
+        (tag) => !existingSlugs.has(utils$1.slugify(tag.name))
       );
       const createdTags = [];
       for (const tag of tagsToCreate) {
@@ -135,7 +136,7 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
           model: "tag",
           data: {
             name: normalizedName,
-            slug: utils.slugify(normalizedName),
+            slug: utils$1.slugify(normalizedName),
             createdAt: /* @__PURE__ */ new Date(),
             updatedAt: /* @__PURE__ */ new Date()
           }
@@ -155,12 +156,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(query, context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
+            await utils.runHookWithShim(
+              () => hooks.onBeforeListPosts(query, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
+            );
           }
           const result = await getters.getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
@@ -188,19 +188,15 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeCreatePost) {
-            const canCreate = await hooks.onBeforeCreatePost(
-              ctx.body,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeCreatePost(ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot create post"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create post"
-              });
-            }
           }
           const { tags, ...postData } = ctx.body;
           const tagNames = tags || [];
-          const slug = utils.slugify(postData.slug || postData.title);
+          const slug = utils$1.slugify(postData.slug || postData.title);
           if (!slug) {
             throw ctx.error(400, {
               message: "Invalid slug: must contain at least one alphanumeric character"
@@ -259,20 +255,15 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeUpdatePost) {
-            const canUpdate = await hooks.onBeforeUpdatePost(
-              ctx.params.id,
-              ctx.body,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeUpdatePost(ctx.params.id, ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot update post"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update post"
-              });
-            }
           }
           const { tags, slug: rawSlug, ...restPostData } = ctx.body;
           const tagNames = tags || [];
-          const slugified = rawSlug ? utils.slugify(rawSlug) : void 0;
+          const slugified = rawSlug ? utils$1.slugify(rawSlug) : void 0;
           if (rawSlug && !slugified) {
             throw ctx.error(400, {
               message: "Invalid slug: must contain at least one alphanumeric character"
@@ -364,15 +355,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeDeletePost) {
-            const canDelete = await hooks.onBeforeDeletePost(
-              ctx.params.id,
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeDeletePost(ctx.params.id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete post"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete post"
-              });
-            }
           }
           await adapter.delete({
             model: "post",
@@ -401,15 +388,11 @@ const blogBackendPlugin = (hooks) => api.defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(
-              { published: true },
-              context
+            await utils.runHookWithShim(
+              () => hooks.onBeforeListPosts({ published: true }, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
             );
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
           }
           const date = query.date;
           const previousPosts = await adapter.findMany({

package/dist/packages/stack/src/plugins/blog/api/plugin.mjs

@@ -6,6 +6,7 @@ import { createPostSchema, updatePostSchema } from '../schemas.mjs';
 import { getAllTags, getPostBySlug, getAllPosts } from './getters.mjs';
 import { BLOG_QUERY_KEYS } from './query-key-defs.mjs';
 import { serializePost, serializeTag } from './serializers.mjs';
+import { runHookWithShim } from '../../utils.mjs';
 
 function createBlogPrefetchForRoute(adapter) {
   return async function prefetchForRoute(key, qc, params) {
@@ -153,12 +154,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(query, context);
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
+            await runHookWithShim(
+              () => hooks.onBeforeListPosts(query, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
+            );
           }
           const result = await getAllPosts(adapter, query);
           if (hooks?.onPostsRead) {
@@ -186,15 +186,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeCreatePost) {
-            const canCreate = await hooks.onBeforeCreatePost(
-              ctx.body,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeCreatePost(ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot create post"
             );
-            if (!canCreate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot create post"
-              });
-            }
           }
           const { tags, ...postData } = ctx.body;
           const tagNames = tags || [];
@@ -257,16 +253,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeUpdatePost) {
-            const canUpdate = await hooks.onBeforeUpdatePost(
-              ctx.params.id,
-              ctx.body,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeUpdatePost(ctx.params.id, ctx.body, context),
+              ctx.error,
+              "Unauthorized: Cannot update post"
             );
-            if (!canUpdate) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot update post"
-              });
-            }
           }
           const { tags, slug: rawSlug, ...restPostData } = ctx.body;
           const tagNames = tags || [];
@@ -362,15 +353,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         };
         try {
           if (hooks?.onBeforeDeletePost) {
-            const canDelete = await hooks.onBeforeDeletePost(
-              ctx.params.id,
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeDeletePost(ctx.params.id, context),
+              ctx.error,
+              "Unauthorized: Cannot delete post"
             );
-            if (!canDelete) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot delete post"
-              });
-            }
           }
           await adapter.delete({
             model: "post",
@@ -399,15 +386,11 @@ const blogBackendPlugin = (hooks) => defineBackendPlugin({
         const context = { query, headers };
         try {
           if (hooks?.onBeforeListPosts) {
-            const canList = await hooks.onBeforeListPosts(
-              { published: true },
-              context
+            await runHookWithShim(
+              () => hooks.onBeforeListPosts({ published: true }, context),
+              ctx.error,
+              "Unauthorized: Cannot list posts"
             );
-            if (!canList) {
-              throw ctx.error(403, {
-                message: "Unauthorized: Cannot list posts"
-              });
-            }
           }
           const date = query.date;
           const previousPosts = await adapter.findMany({