@porulle/core 0.63.0 → 0.65.0

package/src/interfaces/rest/routes/catalog.ts

@@ -53,7 +53,7 @@ import {
 } from "../schemas/catalog.js";
 import {
   type AppEnv,
-  mapErrorToResponse,
+  errorBody,
   mapErrorToStatus,
   parseInclude,
   parsePagination,
@@ -86,7 +86,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok) {
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     }
@@ -112,7 +112,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok) {
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     }
@@ -145,7 +145,7 @@ export function catalogRoutes(kernel: Kernel) {
 
       if (!result.ok) {
         return c.json(
-          mapErrorToResponse(result.error),
+          errorBody(result.error),
           mapErrorToStatus(result.error),
         );
       }
@@ -184,7 +184,7 @@ export function catalogRoutes(kernel: Kernel) {
       });
     } catch (error) {
       console.error("[catalog] List failed:", error instanceof Error ? error.message : error);
-      return c.json(mapErrorToResponse(error), mapErrorToStatus(error));
+      return c.json(errorBody(error), mapErrorToStatus(error));
     }
   });
 
@@ -215,7 +215,7 @@ export function catalogRoutes(kernel: Kernel) {
 
       if (!result.ok) {
         return c.json(
-          mapErrorToResponse(result.error),
+          errorBody(result.error),
           mapErrorToStatus(result.error),
         );
       }
@@ -223,7 +223,7 @@ export function catalogRoutes(kernel: Kernel) {
       return c.json({ data: result.value });
     } catch (error) {
       console.error("[catalog] Get entity failed:", error instanceof Error ? error.message : error);
-      return c.json(mapErrorToResponse(error), mapErrorToStatus(error));
+      return c.json(errorBody(error), mapErrorToStatus(error));
     }
   });
 
@@ -235,7 +235,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok) {
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     }
@@ -251,7 +251,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok) {
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     }
@@ -266,7 +266,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok) {
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     }
@@ -281,7 +281,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -295,7 +295,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -309,7 +309,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -325,7 +325,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { updated: true } });
@@ -341,7 +341,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -357,7 +357,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -372,7 +372,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -387,7 +387,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -396,14 +396,14 @@ export function catalogRoutes(kernel: Kernel) {
   // @ts-expect-error -- openapi handler union return type
   router.openapi(archiveCategoryRoute, async (c) => {
     const result = await kernel.services.catalog.archiveCategory(c.req.param("categoryId"), c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
   // @ts-expect-error -- openapi handler union return type
   router.openapi(restoreCategoryRoute, async (c) => {
     const result = await kernel.services.catalog.restoreCategory(c.req.param("categoryId"), c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -415,7 +415,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -430,7 +430,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -444,7 +444,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { deleted: true } });
@@ -459,7 +459,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { linked: true } });
@@ -474,7 +474,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { unlinked: true } });
@@ -485,7 +485,7 @@ export function catalogRoutes(kernel: Kernel) {
     const result = await kernel.services.catalog.listBrands({ actor: c.get("actor"), tx: null, requestId: "" });
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -499,7 +499,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -514,7 +514,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value });
@@ -528,7 +528,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { deleted: true } });
@@ -543,7 +543,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { linked: true } });
@@ -558,7 +558,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: { unlinked: true } });
@@ -572,7 +572,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -586,7 +586,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -600,7 +600,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -616,7 +616,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, result.value.created ? 201 : 200);
@@ -632,7 +632,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);
@@ -648,7 +648,7 @@ export function catalogRoutes(kernel: Kernel) {
     );
     if (!result.ok)
       return c.json(
-        mapErrorToResponse(result.error),
+        errorBody(result.error),
         mapErrorToStatus(result.error),
       );
     return c.json({ data: result.value }, 201);

package/src/interfaces/rest/routes/checkout.ts

@@ -8,7 +8,6 @@ import {
   calculateTax,
   checkInventoryAvailability,
   completeCheckout,
-  recordAnalyticsEvent,
   resolveCurrentPrices,
   validateCartNotEmpty,
   validatePaymentMethod,
@@ -19,11 +18,11 @@ import { runAfterHooks, runBeforeHooks } from "../../../kernel/hooks/executor.js
 import { createHookContext } from "../../../kernel/hooks/create-context.js";
 import type { AfterHook, BeforeHook, ServiceContainer } from "../../../kernel/hooks/types.js";
 import type { PluginDb } from "../../../kernel/database/plugin-types.js";
-import { type AppEnv, mapErrorToResponse, mapErrorToStatus } from "../utils.js";
+import { type AppEnv, errorBody, mapErrorToStatus } from "../utils.js";
 import { isCommerceError } from "../../../kernel/errors.js";
 import { assertPermission } from "../../../auth/permissions.js";
 import { resolveOrgIdForCommerce } from "../../../auth/org.js";
-import { makeDeterministicId, makeId, makeIdempotencyScope } from "../../../utils/id.js";
+import { makeDeterministicId, makeIdempotencyScope } from "../../../utils/id.js";
 import type { ShippingAddress } from "../../../modules/shipping/calculator.js";
 import type { Actor } from "../../../auth/types.js";
 
@@ -85,7 +84,7 @@ export function checkoutRoutes(kernel: Kernel) {
     const body = c.req.valid("json");
 
     const actor = c.get("actor");
-    const cartSecret = c.req.header("x-cart-secret") ?? c.req.header("X-Cart-Secret") ?? undefined;
+    const cartSecret = c.req.header("x-cart-secret") ?? undefined;
 
     // Idempotent replay is authorized by the order service before payment runs.
     // This preflight only preserves the no-double-payment fast path; the create
@@ -99,7 +98,7 @@ export function checkoutRoutes(kernel: Kernel) {
         cartSecret,
       );
       if (!replay.ok) {
-        return c.json(mapErrorToResponse(replay.error), mapErrorToStatus(replay.error));
+        return c.json(errorBody(replay.error), mapErrorToStatus(replay.error));
       }
       if (replay.value) return c.json({ data: replay.value }, 201);
     }
@@ -116,7 +115,7 @@ export function checkoutRoutes(kernel: Kernel) {
     );
     if (!cartAccess.ok) {
       return c.json(
-        mapErrorToResponse(cartAccess.error),
+        errorBody(cartAccess.error),
         mapErrorToStatus(cartAccess.error),
       );
     }
@@ -127,9 +126,9 @@ export function checkoutRoutes(kernel: Kernel) {
       ? await makeDeterministicId(
           `checkout:${resolveOrgIdForCommerce(actor, kernel.config)}:${idempotencyScope}:${body.idempotencyKey}`,
         )
-      : makeId();
+      : crypto.randomUUID();
     const checkoutData: CheckoutData = {
-      checkoutId: makeId(),
+      checkoutId: crypto.randomUUID(),
       orderId,
       cartId: body.cartId,
       currency: body.currency ?? "USD",
@@ -192,7 +191,6 @@ export function checkoutRoutes(kernel: Kernel) {
 
     const afterHooks: AfterHook<OrderResult>[] = [
       completeCheckout,
-      recordAnalyticsEvent,
       ...(kernel.hooks.resolve("checkout.afterCreate") as AfterHook<OrderResult>[]),
     ];
 
@@ -299,7 +297,7 @@ export function checkoutRoutes(kernel: Kernel) {
 
       if (!order.ok) {
         return c.json(
-          mapErrorToResponse(order.error),
+          errorBody(order.error),
           mapErrorToStatus(order.error),
         );
       }

package/src/interfaces/rest/routes/customers.ts

@@ -12,7 +12,7 @@ import {
   updateInteractionRoute,
   deleteInteractionRoute,
 } from "../schemas/customers.js";
-import { type AppEnv, mapErrorToResponse, mapErrorToStatus, parsePagination, parseInclude, requirePerm } from "../utils.js";
+import { type AppEnv, errorBody, mapErrorToStatus, parsePagination, parseInclude, requirePerm } from "../utils.js";
 
 export function customerRoutes(kernel: Kernel) {
   const router = new OpenAPIHono<AppEnv>();
@@ -27,7 +27,7 @@ export function customerRoutes(kernel: Kernel) {
     const { page, limit } = parsePagination(c.req.query());
 
     const result = await kernel.services.customers.list(actor);
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
 
     const all = result.value;
     const total = all.length;
@@ -46,7 +46,7 @@ export function customerRoutes(kernel: Kernel) {
   router.openapi(createCustomerRoute, async (c) => {
     const body = c.req.valid("json");
     const result = await kernel.services.customers.createWalkIn(body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value }, 201);
   });
 
@@ -55,7 +55,7 @@ export function customerRoutes(kernel: Kernel) {
     const { id } = c.req.valid("param");
     const actor = c.get("actor");
     const result = await kernel.services.customers.getById(id, actor);
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -75,7 +75,7 @@ export function customerRoutes(kernel: Kernel) {
     const result = await kernel.services.customers.update(id, updates, actor, undefined, {
       replaceMetadata,
     });
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -92,7 +92,7 @@ export function customerRoutes(kernel: Kernel) {
       { page, limit, ...(status ? { status } : {}), ...(includeTotals ? { includeTotals: true } : {}) },
       actor,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     if (includeTotals) {
       // Wrapped shape: { data: { items, totals } } (+ pagination meta).
       return c.json({
@@ -111,13 +111,13 @@ export function customerRoutes(kernel: Kernel) {
 
     // Get customer first, then use their userId for address lookup
     const customerResult = await kernel.services.customers.getById(id, actor);
-    if (!customerResult.ok) return c.json(mapErrorToResponse(customerResult.error), mapErrorToStatus(customerResult.error));
+    if (!customerResult.ok) return c.json(errorBody(customerResult.error), mapErrorToStatus(customerResult.error));
 
     const addressResult = await kernel.services.customers.getAddresses(
       customerResult.value.userId,
       actor,
     );
-    if (!addressResult.ok) return c.json(mapErrorToResponse(addressResult.error), mapErrorToStatus(addressResult.error));
+    if (!addressResult.ok) return c.json(errorBody(addressResult.error), mapErrorToStatus(addressResult.error));
     return c.json({ data: addressResult.value });
   });
 
@@ -127,7 +127,7 @@ export function customerRoutes(kernel: Kernel) {
   router.openapi(listInteractionsRoute, async (c) => {
     const { id } = c.req.valid("param");
     const result = await kernel.services.customers.listInteractions(id, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -136,7 +136,7 @@ export function customerRoutes(kernel: Kernel) {
     const { id } = c.req.valid("param");
     const body = c.req.valid("json");
     const result = await kernel.services.customers.createInteraction(id, body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value }, 201);
   });
 
@@ -145,7 +145,7 @@ export function customerRoutes(kernel: Kernel) {
     const { id, iid } = c.req.valid("param");
     const body = c.req.valid("json");
     const result = await kernel.services.customers.updateInteraction(id, iid, body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -153,7 +153,7 @@ export function customerRoutes(kernel: Kernel) {
   router.openapi(deleteInteractionRoute, async (c) => {
     const { id, iid } = c.req.valid("param");
     const result = await kernel.services.customers.deleteInteraction(id, iid, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: { deleted: true } });
   });
 

package/src/interfaces/rest/routes/documents.ts

@@ -6,7 +6,7 @@ import {
   invoicePdfRoute,
   receiptHtmlRoute,
 } from "../schemas/documents.js";
-import { type AppEnv, mapErrorToResponse, mapErrorToStatus, requireAnyPerm } from "../utils.js";
+import { type AppEnv, errorBody, mapErrorToStatus, requireAnyPerm } from "../utils.js";
 
 /**
  * Order document rendering (issue #47). Mounted under /orders. Access
@@ -19,14 +19,14 @@ export function documentRoutes(kernel: Kernel) {
   router.use("/*", requireAnyPerm(["orders:read", "orders:read:own"]));
 
   router.openapi(invoicePdfRoute, async (c) => {
-    const guestCredential = c.req.header("x-cart-secret") ?? c.req.header("X-Cart-Secret") ?? undefined;
+    const guestCredential = c.req.header("x-cart-secret") ?? undefined;
     const result = await kernel.services.documents.renderInvoicePdf(
       c.req.param("id"),
       c.get("actor"),
       undefined,
       guestCredential,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.body(result.value.pdf.slice().buffer as ArrayBuffer, 200, {
       "content-type": "application/pdf",
       "content-disposition": `inline; filename="invoice-${result.value.invoiceNumber}.pdf"`,
@@ -34,32 +34,32 @@ export function documentRoutes(kernel: Kernel) {
   });
 
   router.openapi(invoiceHtmlRoute, async (c) => {
-    const guestCredential = c.req.header("x-cart-secret") ?? c.req.header("X-Cart-Secret") ?? undefined;
+    const guestCredential = c.req.header("x-cart-secret") ?? undefined;
     const result = await kernel.services.documents.renderInvoiceHtml(
       c.req.param("id"),
       c.get("actor"),
       undefined,
       guestCredential,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.html(result.value.html);
   });
 
   router.openapi(receiptHtmlRoute, async (c) => {
-    const guestCredential = c.req.header("x-cart-secret") ?? c.req.header("X-Cart-Secret") ?? undefined;
+    const guestCredential = c.req.header("x-cart-secret") ?? undefined;
     const result = await kernel.services.documents.renderReceiptHtml(
       c.req.param("id"),
       c.get("actor"),
       undefined,
       guestCredential,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.html(result.value.html);
   });
 
   // @ts-expect-error -- openapi handler union return type
   router.openapi(emailInvoiceRoute, async (c) => {
-    const guestCredential = c.req.header("x-cart-secret") ?? c.req.header("X-Cart-Secret") ?? undefined;
+    const guestCredential = c.req.header("x-cart-secret") ?? undefined;
     const result = await kernel.services.documents.emailInvoice(
       c.req.param("id"),
       c.req.valid("json").to,
@@ -67,7 +67,7 @@ export function documentRoutes(kernel: Kernel) {
       undefined,
       guestCredential,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 

package/src/interfaces/rest/routes/inventory.ts

@@ -9,7 +9,7 @@ import {
   listWarehousesRoute,
   listInventoryLevelsRoute,
 } from "../schemas/inventory.js";
-import { type AppEnv, mapErrorToResponse, mapErrorToStatus, requirePerm } from "../utils.js";
+import { type AppEnv, errorBody, mapErrorToStatus, requirePerm } from "../utils.js";
 
 export function inventoryRoutes(kernel: Kernel) {
   const router = new OpenAPIHono<AppEnv>();
@@ -39,7 +39,7 @@ export function inventoryRoutes(kernel: Kernel) {
       },
       actor,
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -54,7 +54,7 @@ export function inventoryRoutes(kernel: Kernel) {
       entityIds,
       c.get("actor"),
     );
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });
 
@@ -62,7 +62,7 @@ export function inventoryRoutes(kernel: Kernel) {
   router.openapi(inventoryAdjustRoute, async (c) => {
     const body = c.req.valid("json");
     const result = await kernel.services.inventory.adjustDetailed(body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     const { level, before, after, delta, movementId } = result.value;
     // Additive: level fields (back-compat) plus before/after/delta/movementId.
     return c.json({ data: { ...level, before, after, delta, movementId } });
@@ -72,7 +72,7 @@ export function inventoryRoutes(kernel: Kernel) {
   router.openapi(inventoryReserveRoute, async (c) => {
     const body = c.req.valid("json");
     const result = await kernel.services.inventory.reserve(body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: { reserved: true } });
   });
 
@@ -80,7 +80,7 @@ export function inventoryRoutes(kernel: Kernel) {
   router.openapi(inventoryReleaseRoute, async (c) => {
     const body = c.req.valid("json");
     const result = await kernel.services.inventory.release(body, c.get("actor"));
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: { released: true } });
   });
 
@@ -95,7 +95,7 @@ export function inventoryRoutes(kernel: Kernel) {
       return c.json({ error: { code: "FORBIDDEN", message: "Permission 'inventory:adjust' is required." } }, 403);
     }
     const result = await kernel.services.inventory.createWarehouse(body, actor);
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value }, 201);
   });
 
@@ -103,7 +103,7 @@ export function inventoryRoutes(kernel: Kernel) {
   router.openapi(listWarehousesRoute, async (c) => {
     const actor = c.get("actor");
     const result = await kernel.services.inventory.listWarehouses(actor);
-    if (!result.ok) return c.json(mapErrorToResponse(result.error), mapErrorToStatus(result.error));
+    if (!result.ok) return c.json(errorBody(result.error), mapErrorToStatus(result.error));
     return c.json({ data: result.value });
   });