@ossy/platform 1.38.5 → 1.38.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "1.38.5",
+  "version": "1.38.7",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -38,13 +38,13 @@
     "@aws-sdk/s3-request-presigner": "^3.1057.0",
     "@aws-sdk/util-create-request": "^3.972.26",
     "@aws-sdk/util-format-url": "^3.972.17",
-    "@ossy/event-store": "^1.7.5",
-    "@ossy/observability": "^1.7.5",
-    "@ossy/policies": "^1.12.5",
-    "@ossy/router": "^1.39.5",
-    "@ossy/sdk": "^1.39.5",
-    "@ossy/tokens": "^1.12.5",
-    "@ossy/users": "^1.12.5",
+    "@ossy/event-store": "^1.7.7",
+    "@ossy/observability": "^1.7.7",
+    "@ossy/policies": "^1.12.7",
+    "@ossy/router": "^1.39.7",
+    "@ossy/sdk": "^1.39.7",
+    "@ossy/tokens": "^1.12.7",
+    "@ossy/users": "^1.12.7",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -62,5 +62,5 @@
     "src",
     "Dockerfile"
   ],
-  "gitHead": "97d02b0762f2c0461abb1e6753fc3aaad30ee93f"
+  "gitHead": "f65df0cd6da864c314c4f424112e05e8e2dec0ff"
 }

package/src/PlatformShell.jsx

@@ -13,24 +13,24 @@ import { ComponentSlotsProvider, Slot } from '@ossy/design-system'
  * to override or fill these slots with layout-specific components — the inner
  * provider shallow-merges on top.
  *
- * Slot regions rendered here:
- *   header          — top bar across full width
- *   sidebar         — left column, full height
- *   toolbar         — below header, above content (contextual actions)
- *   notifications   — floating / bottom corner (toasts, badges)
- *   system-messages — banner above content (maintenance, errors)
+ * Slot regions rendered here (namespaced keys from app `export const slots`):
+ *   shell:header           — top bar across full width
+ *   shell:sidebar          — left column, full height
+ *   shell:toolbar          — below header, above content (contextual actions)
+ *   shell:notifications    — floating / bottom corner (toasts, badges)
+ *   shell:system-messages  — banner above content (maintenance, errors)
  *
  * @param {{ slots?: Record<string, import('react').ComponentType | null>, children: import('react').ReactNode }} props
  */
 export function PlatformShell({ slots = {}, children }) {
   return (
     <ComponentSlotsProvider slots={slots}>
-      <Slot name="system-messages" />
-      <Slot name="header" />
-      <Slot name="sidebar" />
-      <Slot name="toolbar" />
+      <Slot name="shell:system-messages" />
+      <Slot name="shell:header" />
+      <Slot name="shell:sidebar" />
+      <Slot name="shell:toolbar" />
       {children}
-      <Slot name="notifications" />
+      <Slot name="shell:notifications" />
     </ComponentSlotsProvider>
   )
 }

package/src/runtime.js

@@ -5,6 +5,7 @@ import cookieParser from 'cookie-parser'
 import morgan from 'morgan'
 import { Router as OssyRouter } from '@ossy/router'
 import { loadManifest, resolveEntryUrl } from './server.js'
+import { buildManifestSummary } from '@ossy/app/manifest/build-manifest-summary'
 import { ProxyInternal } from './proxy-internal.js'
 import { loadSite, invalidateSite } from './site-loader.js'
 import { createLogger } from '@ossy/observability'
@@ -48,7 +49,7 @@ function buildSiteContext (manifest, buildDir) {
     return promise
   }
 
-  return { pageRouter, apiRouter, manifest, loadEntry }
+  return { pageRouter, apiRouter, manifest, manifestSummary: buildManifestSummary(manifest), loadEntry }
 }
 
 async function getSiteContext (domain) {
@@ -127,7 +128,7 @@ export async function startRuntime ({ port } = {}) {
       return
     }
 
-    const { pageRouter, apiRouter, manifest, loadEntry } = context
+    const { pageRouter, apiRouter, manifest, manifestSummary, loadEntry } = context
 
     try {
       const apiRoute = apiRouter.getPageByUrl(requestUrl)
@@ -172,9 +173,14 @@ export async function startRuntime ({ port } = {}) {
         theme: req.userAppSettings?.theme || cloneSerializable(config?.theme),
         themes: cloneSerializable(config?.themes),
         resourceTemplates: cloneSerializable(manifest.resourceTemplates),
+        manifestSummary: cloneSerializable(manifestSummary),
         url: requestUrl,
         isAuthenticated: !!req.isAuthenticated,
-        pages: manifest.pages.map((page) => ({ id: page.id, path: page.path })),
+        pages: manifest.pages.map((page) => ({
+          id: page.id,
+          path: page.path,
+          ...(page.package ? { package: page.package } : {}),
+        })),
         pageId: pageRoute.id,
       }
       const html = await mod.render(props)

package/src/server.js

@@ -10,6 +10,8 @@ import { SDK } from '@ossy/sdk'
 import { AggregateRebuild } from '@ossy/event-store'
 import { TaskService } from './tasks/task-service.js'
 import { ChangeStream } from './tasks/change-stream.js'
+import { CONTENT_SLOT_NAME } from '@ossy/app/runtime/resolve-shell-slots'
+import { buildManifestSummary } from '@ossy/app/manifest/build-manifest-summary'
 import { registerResourceTemplate } from './resources/resource-template.registry.js'
 import { IntegrationService } from './integration.service.js'
 import { ActionService } from './actions/action.service.js'
@@ -55,12 +57,12 @@ export function loadManifest (buildDir) {
   const apis = entries.filter((e) => e.type === 'api' && validRoutable(e))
   const tasks = entries.filter((e) => e.type === 'task')
   const components = Array.isArray(manifest.components) ? manifest.components : []
-  const slots = Array.isArray(manifest.slots) ? manifest.slots : []
   const resourceTemplates = Array.isArray(manifest.resourceTemplates) ? manifest.resourceTemplates : []
   const aggregates = Array.isArray(manifest.aggregates) ? manifest.aggregates : []
   const integrations = Array.isArray(manifest.integrations) ? manifest.integrations : []
   const startups = Array.isArray(manifest.startups) ? manifest.startups : []
   const actions = Array.isArray(manifest.actions) ? manifest.actions : []
+  const emails = Array.isArray(manifest.emails) ? manifest.emails : []
   const layouts = Array.isArray(manifest.layouts) ? manifest.layouts : []
   for (const e of entries) {    if ((e.type === 'page' || e.type === 'api') && !validRoutable(e)) {
       log.warn(`Skipping ${e.type} "${e.id}" — manifest entry has no path.`)
@@ -72,12 +74,12 @@ export function loadManifest (buildDir) {
     apis,
     tasks,
     components,
-    slots,
     resourceTemplates,
     aggregates,
     integrations,
     startups,
     actions,
+    emails,
     layouts,
     config: manifest.config || {},
   }
@@ -108,6 +110,7 @@ export async function startServer (options = {}) {
   }
 
   const manifest = loadManifest(buildDir)
+  const manifestSummary = buildManifestSummary(manifest)
   const config = manifest.config
   const supportedLanguages = Array.isArray(config.supportedLanguages) ? config.supportedLanguages : []
   const defaultLanguage = config.defaultLanguage
@@ -201,25 +204,12 @@ export async function startServer (options = {}) {
     }
   }
 
-  // Slot loading — import each component that declares `export const slot` and
-  // build a map of slot-name → entry URL for the render pipeline. Components
-  // whose chunk fails to import are silently skipped so a broken slot never
-  // prevents the server from starting. The slot entries are appended to
-  // `componentEntries` at render time, keyed by slot name, so that the App's
-  // ComponentSlotsProvider makes them available to the entire React tree.
-  // Layout-level ComponentSlotsProviders can merge on top to override slots
-  // for their subtree (e.g. layout fills `header` with brand-specific chrome).
-  /** @type {Array<{ id: string, entry: string }>} */
-  const slotComponentEntries = []
-  for (const slotEntry of manifest.slots ?? []) {
-    try {
-      // Verify the chunk is importable at startup so we fail fast on bad builds.
-      await import(resolveEntryUrl(slotEntry.entry, buildDir))
-      slotComponentEntries.push({ id: slotEntry.slot, entry: slotEntry.entry })
-    } catch (err) {
-      log.warn(`Failed to load slot component "${slotEntry.slot}"`, undefined, err)
-    }
-  }
+  // App-controlled shell slots: `export const slots` in `*.layout.jsx` is recorded
+  // on `manifest.layouts[0].slots` at build time and resolved at render in page-runtime.
+  const layoutSlots =
+    layoutEntry && typeof layoutEntry.slots === 'object' && !Array.isArray(layoutEntry.slots)
+      ? layoutEntry.slots
+      : {}
 
   // Register the SDK so all tasks receive it as `sdk`.
   // Priority: explicit options.sdk → SDK.of() from env vars → null (direct-DB fallback in tasks).
@@ -332,19 +322,25 @@ export async function startServer (options = {}) {
         }
         const Layout = appLayout?.component ?? null
         const layoutEntry = appLayout?.entry ?? null
+        // Page component → `shell:content` is resolved in page-runtime (SSR + hydrate).
         const props = {
           ...config,
           ...(req.userAppSettings || {}),
           theme: req.userAppSettings?.theme || cloneSerializable(config?.theme),
           themes: cloneSerializable(config?.themes),
           resourceTemplates: cloneSerializable(manifest.resourceTemplates),
+          manifestSummary: cloneSerializable(manifestSummary),
           url: requestUrl,
           isAuthenticated: !!req.isAuthenticated,
-          pages: manifest.pages.map((page) => ({ id: page.id, path: page.path })),
+          pages: manifest.pages.map((page) => ({
+            id: page.id,
+            path: page.path,
+            ...(page.package ? { package: page.package } : {}),
+          })),
           pageId: pageRoute.id,
-          // Slot component entries are prepended so that layout-level
-          // ComponentSlotsProviders (which merge on top) can override them.
-          componentEntries: [...slotComponentEntries, ...manifest.components],
+          componentEntries: manifest.components,
+          layoutSlots,
+          contentSlotName: CONTENT_SLOT_NAME,
           Layout,
           layoutEntry,
         }