@ossy/platform 3.7.0 → 3.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -45,16 +45,16 @@
     "@aws-sdk/util-format-url": "^3.972.17",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "@ossy/config": "^3.0.9",
-    "@ossy/event-store": "^3.7.0",
+    "@ossy/event-store": "^3.8.0",
     "@ossy/locale": "^3.4.0",
-    "@ossy/manifest": "^3.6.1",
+    "@ossy/manifest": "^3.8.0",
     "@ossy/observability": "^3.0.9",
     "@ossy/policies": "^3.0.9",
-    "@ossy/schema": "^3.6.1",
+    "@ossy/schema": "^3.8.0",
     "@ossy/sdk": "^3.5.0",
     "@ossy/tokens": "^3.5.0",
-    "@ossy/users": "^3.6.1",
-    "@ossy/workspaces": "^3.6.1",
+    "@ossy/users": "^3.8.0",
+    "@ossy/workspaces": "^3.8.0",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -75,5 +75,5 @@
     "Dockerfile",
     "docker-healthcheck.js"
   ],
-  "gitHead": "622d97535abad08415963405ace2f5aaaecd7ca4"
+  "gitHead": "14548dfc2019e7258e8c75db527acbf66fe829bd"
 }

package/src/audit/task-run-service.js

@@ -15,6 +15,15 @@ import { rejectOnAbort } from '../request-diagnostics.js'
 
 const log = createLogger('platform/task-run')
 
+/** Workspace scope must be on every TaskRun event so list projections can Apply it. */
+function taskRunScopePayload ({ taskId, workspaceId }) {
+  return {
+    taskId,
+    moduleId: moduleIdFromTaskId(taskId),
+    belongsTo: workspaceId,
+  }
+}
+
 function assertNotAborted (context) {
   if (context.signal?.aborted) {
     throw context.signal.reason instanceof Error
@@ -91,6 +100,8 @@ export const TaskRunService = {
       const durationMs = Date.now() - startMs
       await TaskRunService._appendCompleted({
         runId,
+        taskId,
+        workspaceId,
         actorId,
         durationMs,
         resultSummary: summarizeResult(result),
@@ -114,6 +125,8 @@ export const TaskRunService = {
       const durationMs = Date.now() - startMs
       await TaskRunService._appendFailed({
         runId,
+        taskId,
+        workspaceId,
         actorId,
         durationMs,
         error: summarizeError(error),
@@ -180,26 +193,34 @@ export const TaskRunService = {
     }
   },
 
-  async _appendCompleted ({ runId, actorId, durationMs, resultSummary }) {
+  async _appendCompleted ({ runId, taskId, workspaceId, actorId, durationMs, resultSummary }) {
     try {
       await Aggregate.Of(TaskRun, runId)
         .then(Aggregate.Add({
           event: 'Completed',
           createdBy: actorId ?? undefined,
-          payload: { durationMs, resultSummary },
+          payload: {
+            durationMs,
+            resultSummary,
+            ...taskRunScopePayload({ taskId, workspaceId }),
+          },
         }))
     } catch (err) {
       log.warn('[TaskRunService] Failed to record Completed', { runId }, err)
     }
   },
 
-  async _appendFailed ({ runId, actorId, durationMs, error }) {
+  async _appendFailed ({ runId, taskId, workspaceId, actorId, durationMs, error }) {
     try {
       await Aggregate.Of(TaskRun, runId)
         .then(Aggregate.Add({
           event: 'Failed',
           createdBy: actorId ?? undefined,
-          payload: { durationMs, error },
+          payload: {
+            durationMs,
+            error,
+            ...taskRunScopePayload({ taskId, workspaceId }),
+          },
         }))
     } catch (err) {
       log.warn('[TaskRunService] Failed to record Failed', { runId }, err)

package/src/server.js

@@ -495,6 +495,8 @@ export async function startServer (options = {}) {
         } = resolvePageLayoutRender(layoutsById, pageEntry)
         const { language, messages, fallbackMessages } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
         let schemasForPage = cloneSerializable(manifest.schemas || [])
+        let ssrWorkspaceName
+        let ssrWorkspaceServices
         if (req.workspaceId && loadWorkspaceForEntitlements) {
           const workspaceTimer = createTimedOperation(`SSR loadWorkspace ${req.workspaceId}`, { log })
           try {
@@ -506,6 +508,8 @@ export async function startServer (options = {}) {
                 cloneSerializable(workspace.schemas),
               )
             }
+            ssrWorkspaceName = workspace?.name
+            ssrWorkspaceServices = workspace?.services
           } catch (err) {
             workspaceTimer.finish({
               pageId: pageRoute.id,
@@ -527,6 +531,9 @@ export async function startServer (options = {}) {
         const props = {
           ...config,
           ...(req.userAppSettings || {}),
+          ...(req.workspaceId ? { workspaceId: req.workspaceId } : {}),
+          ...(ssrWorkspaceName != null ? { workspaceName: ssrWorkspaceName } : {}),
+          ...(ssrWorkspaceServices != null ? { workspaceServices: cloneSerializable(ssrWorkspaceServices) } : {}),
           theme: req.userAppSettings?.theme || cloneSerializable(config?.theme),
           themes: cloneSerializable(config?.themes),
           schemas: schemasForPage,

package/src/storage/storage-keys.js

@@ -6,6 +6,24 @@
  */
 
 const KEY_PATTERN = /^[A-Za-z0-9_-]+(:[A-Za-z0-9_-]+)?$/
+const RESOURCE_ID_PATTERN = /^[A-Za-z0-9_-]+$/
+
+export function isStorageKey (key) {
+  return typeof key === 'string' && KEY_PATTERN.test(key)
+}
+
+/**
+ * Map a stored `content.Key` to a logical key for `/r/{id}` URLs.
+ * Legacy S3 paths (`media/{workspaceId}/{resourceId}/original.ext`) fall back
+ * to `resourceId` so folder list does not 500 after leftover File docs appear.
+ */
+export function coerceStorageKey (key, fallbackResourceId) {
+  if (isStorageKey(key)) return key
+  if (typeof fallbackResourceId === 'string' && RESOURCE_ID_PATTERN.test(fallbackResourceId)) {
+    return fallbackResourceId
+  }
+  return null
+}
 
 export function originalObjectKey (resourceId) {
   assertResourceId(resourceId)
@@ -31,7 +49,7 @@ export function assertStorageKey (key) {
 }
 
 function assertResourceId (resourceId) {
-  if (!resourceId || typeof resourceId !== 'string' || !/^[A-Za-z0-9_-]+$/.test(resourceId)) {
+  if (!resourceId || typeof resourceId !== 'string' || !RESOURCE_ID_PATTERN.test(resourceId)) {
     throw new Error(`[storage-keys] invalid resourceId: ${resourceId}`)
   }
 }

package/src/storage/storage-keys.spec.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from '@jest/globals'
-import { originalObjectKey, derivativeObjectKey, assertStorageKey } from './storage-keys.js'
+import { originalObjectKey, derivativeObjectKey, assertStorageKey, coerceStorageKey } from './storage-keys.js'
 
 describe('storage-keys', () => {
   it('originalObjectKey returns flat resourceId', () => {
@@ -13,4 +13,10 @@ describe('storage-keys', () => {
   it('rejects path-like keys', () => {
     expect(() => assertStorageKey('media/ws/file')).toThrow()
   })
+
+  it('coerces legacy media paths to the resource id', () => {
+    expect(coerceStorageKey('media/ws/abc123/original.pdf', 'abc123')).toBe('abc123')
+    expect(coerceStorageKey('abc123:galleryMedium', 'abc123')).toBe('abc123:galleryMedium')
+    expect(coerceStorageKey('media/ws/file', 'not valid')).toBe(null)
+  })
 })

package/src/tasks/task-service.spec.js

@@ -132,12 +132,28 @@ describe('TaskRunList projection', () => {
       resourceId: 'run1',
       event: 'Completed',
       created: 2000,
-      payload: { durationMs: 1000, resultSummary: null },
+      payload: {
+        durationMs: 1000,
+        resultSummary: null,
+        belongsTo: 'ws1',
+        taskId: '@ossy/media-tasks/tasks/resize',
+        moduleId: 'media-tasks',
+      },
     }, state)
 
     expect(state.runs[0].status).toBe('success')
     expect(state.runs[0].durationMs).toBe(1000)
   })
+
+  it('scopes Completed/Failed from payload.belongsTo (changestream dispatch)', () => {
+    expect(TaskRunListProjection.scopeFromEvent({
+      payload: { durationMs: 10 },
+    })).toBeNull()
+
+    expect(TaskRunListProjection.scopeFromEvent({
+      payload: { durationMs: 10, belongsTo: 'ws1' },
+    })).toBe('ws1')
+  })
 })
 
 describe('ActionInvocation entity fold', () => {