@open-mercato/core 0.6.7-develop.6653.1.b5bc7194a0 → 0.6.7-develop.6660.1.90e1e2eef6

package/dist/modules/workflows/api/definitions/[id]/reset-to-code/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/modules/workflows/api/definitions/%5Bid%5D/reset-to-code/route.ts"],
-  "sourcesContent": ["/**\n * Reset Customized Workflow Definition to Code\n *\n * POST /api/workflows/definitions/[id]/reset-to-code\n *\n * Deletes the DB override row for a code-based workflow definition,\n * reverting it back to the original code registry version.\n */\n\nimport { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'\nimport { WorkflowDefinition, WorkflowInstance } from '../../../../data/entities'\nimport { serializeCodeWorkflowDefinition } from '../../serialize'\nimport { getCodeWorkflow } from '../../../../lib/code-registry'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('workflows')\n\nexport const metadata = {\n  requireAuth: true,\n  requireFeatures: ['workflows.definitions.edit'],\n}\n\ninterface RouteContext {\n  params: Promise<{\n    id: string\n  }>\n}\n\n/**\n * POST /api/workflows/definitions/[id]/reset-to-code\n *\n * Reset a customized code workflow definition back to its original code version.\n */\nexport async function POST(\n  request: NextRequest,\n  context: RouteContext\n) {\n  try {\n    const params = await context.params\n    const container = await createRequestContainer()\n    const em = container.resolve('em')\n    const auth = await getAuthFromRequest(request)\n\n    if (!auth) {\n      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request })\n    const tenantId = auth.tenantId\n    const organizationId = scope?.selectedId ?? auth.orgId\n\n    // Check edit permission\n    const rbacService = container.resolve('rbacService')\n    const hasPermission = await rbacService.userHasAllFeatures(\n      auth.sub,\n      ['workflows.definitions.edit'],\n      {\n        tenantId,\n        organizationId,\n      }\n    )\n\n    if (!hasPermission) {\n      return NextResponse.json(\n        { error: 'Insufficient permissions' },\n        { status: 403 }\n      )\n    }\n\n    // Find existing definition\n    const definition = await em.findOne(WorkflowDefinition, {\n      id: params.id,\n      tenantId,\n      organizationId,\n      deletedAt: null,\n    })\n\n    if (!definition) {\n      return NextResponse.json(\n        { error: 'Workflow definition not found' },\n        { status: 404 }\n      )\n    }\n\n    // Verify this is a code-based override\n    if (!definition.codeWorkflowId) {\n      return NextResponse.json(\n        { error: 'This workflow definition is not a code-based override and cannot be reset' },\n        { status: 400 }\n      )\n    }\n\n    // Check if there are active workflow instances using this definition\n    const activeInstances = await em.count(WorkflowInstance, {\n      definitionId: definition.id,\n      status: { $in: ['RUNNING', 'WAITING'] },\n    })\n\n    if (activeInstances > 0) {\n      return NextResponse.json(\n        {\n          error: `Cannot reset workflow definition with ${activeInstances} active instance(s)`,\n        },\n        { status: 409 }\n      )\n    }\n\n    const guardResult = await validateCrudMutationGuard(container, {\n      tenantId: tenantId ?? '',\n      organizationId: organizationId ?? null,\n      userId: auth.sub ?? '',\n      resourceKind: 'workflows.definition',\n      resourceId: String(definition.id),\n      operation: 'custom',\n      requestMethod: 'POST',\n      requestHeaders: request.headers,\n    })\n    if (guardResult && !guardResult.ok) {\n      return NextResponse.json(guardResult.body, { status: guardResult.status })\n    }\n\n    // Look up the original code definition before deleting\n    const codeDef = getCodeWorkflow(definition.codeWorkflowId)\n\n    // Snapshot identifying fields before remove() detaches the entity\n    const removedSnapshot = {\n      id: String(definition.id),\n      workflowId: definition.workflowId,\n      codeWorkflowId: definition.codeWorkflowId,\n      tenantId: definition.tenantId,\n      organizationId: definition.organizationId,\n    }\n\n    // Hard-delete the DB override row\n    em.remove(definition)\n    await em.flush()\n\n    if (guardResult?.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: tenantId ?? '',\n        organizationId: organizationId ?? null,\n        userId: auth.sub ?? '',\n        resourceKind: 'workflows.definition',\n        resourceId: removedSnapshot.id,\n        operation: 'custom',\n        requestMethod: 'POST',\n        requestHeaders: request.headers,\n        metadata: guardResult.metadata,\n      })\n    }\n\n    try {\n      const eventBus = container.resolve('eventBus') as\n        | { emitEvent(event: string, payload: unknown, options?: unknown): Promise<void> }\n        | undefined\n      if (eventBus && typeof eventBus.emitEvent === 'function') {\n        await eventBus.emitEvent(\n          'workflows.definition.reset_to_code',\n          {\n            id: removedSnapshot.id,\n            workflowId: removedSnapshot.workflowId,\n            codeWorkflowId: removedSnapshot.codeWorkflowId,\n            tenantId: removedSnapshot.tenantId,\n            organizationId: removedSnapshot.organizationId,\n            userId: auth.sub ?? null,\n          },\n          {\n            tenantId: removedSnapshot.tenantId,\n            organizationId: removedSnapshot.organizationId,\n            persistent: true,\n          },\n        )\n      }\n    } catch (eventError) {\n      logger.error('Failed to emit workflows.definition.reset_to_code event', { err: eventError })\n    }\n\n    if (!codeDef) {\n      return NextResponse.json({\n        message: 'Workflow definition reset to code version (code definition no longer registered)',\n        data: null,\n      })\n    }\n\n    const syntheticId = `code:${codeDef.workflowId}`\n\n    return NextResponse.json({\n      data: serializeCodeWorkflowDefinition(codeDef, syntheticId),\n      message: 'Workflow definition reset to code version',\n    })\n  } catch (error) {\n    logger.error('Error resetting workflow definition to code', { err: error })\n    return NextResponse.json(\n      { error: 'Failed to reset workflow definition to code' },\n      { status: 500 }\n    )\n  }\n}\n\nexport const openApi = {\n  methods: {\n    POST: {\n      summary: 'Reset workflow definition to code version',\n      description: 'Deletes the DB override for a code-based workflow definition, reverting it to the original code registry version. Cannot be reset if there are active instances.',\n      tags: ['Workflows'],\n      pathParams: z.object({\n        id: z.string().uuid(),\n      }),\n      responses: [\n        {\n          status: 200,\n          description: 'Workflow definition reset to code version',\n          example: {\n            data: {\n              id: 'code:checkout-flow',\n              workflowId: 'checkout-flow',\n              workflowName: 'Checkout Flow',\n              description: 'Code-defined checkout workflow',\n              version: 1,\n              source: 'code',\n              isCodeBased: true,\n            },\n            message: 'Workflow definition reset to code version',\n          },\n        },\n        {\n          status: 400,\n          description: 'Definition is not a code-based override',\n          example: {\n            error: 'This workflow definition is not a code-based override and cannot be reset',\n          },\n        },\n        {\n          status: 404,\n          description: 'Workflow definition not found',\n          example: {\n            error: 'Workflow definition not found',\n          },\n        },\n        {\n          status: 409,\n          description: 'Cannot reset - active workflow instances exist',\n          example: {\n            error: 'Cannot reset workflow definition with 3 active instance(s)',\n          },\n        },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * Reset Customized Workflow Definition to Code\n *\n * POST /api/workflows/definitions/[id]/reset-to-code\n *\n * Deletes the DB override row for a code-based workflow definition,\n * reverting it back to the original code registry version.\n */\n\nimport { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'\nimport { WorkflowDefinition, WorkflowInstance } from '../../../../data/entities'\nimport { serializeCodeWorkflowDefinition } from '../../serialize'\nimport { getCodeWorkflow } from '../../../../lib/code-registry'\nimport { invalidateTriggerCache } from '../../../../lib/event-trigger-service'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('workflows')\n\nexport const metadata = {\n  requireAuth: true,\n  requireFeatures: ['workflows.definitions.edit'],\n}\n\ninterface RouteContext {\n  params: Promise<{\n    id: string\n  }>\n}\n\n/**\n * POST /api/workflows/definitions/[id]/reset-to-code\n *\n * Reset a customized code workflow definition back to its original code version.\n */\nexport async function POST(\n  request: NextRequest,\n  context: RouteContext\n) {\n  try {\n    const params = await context.params\n    const container = await createRequestContainer()\n    const em = container.resolve('em')\n    const auth = await getAuthFromRequest(request)\n\n    if (!auth) {\n      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request })\n    const tenantId = auth.tenantId\n    const organizationId = scope?.selectedId ?? auth.orgId\n\n    // Check edit permission\n    const rbacService = container.resolve('rbacService')\n    const hasPermission = await rbacService.userHasAllFeatures(\n      auth.sub,\n      ['workflows.definitions.edit'],\n      {\n        tenantId,\n        organizationId,\n      }\n    )\n\n    if (!hasPermission) {\n      return NextResponse.json(\n        { error: 'Insufficient permissions' },\n        { status: 403 }\n      )\n    }\n\n    // Find existing definition\n    const definition = await em.findOne(WorkflowDefinition, {\n      id: params.id,\n      tenantId,\n      organizationId,\n      deletedAt: null,\n    })\n\n    if (!definition) {\n      return NextResponse.json(\n        { error: 'Workflow definition not found' },\n        { status: 404 }\n      )\n    }\n\n    // Verify this is a code-based override\n    if (!definition.codeWorkflowId) {\n      return NextResponse.json(\n        { error: 'This workflow definition is not a code-based override and cannot be reset' },\n        { status: 400 }\n      )\n    }\n\n    // Check if there are active workflow instances using this definition\n    const activeInstances = await em.count(WorkflowInstance, {\n      definitionId: definition.id,\n      status: { $in: ['RUNNING', 'WAITING'] },\n    })\n\n    if (activeInstances > 0) {\n      return NextResponse.json(\n        {\n          error: `Cannot reset workflow definition with ${activeInstances} active instance(s)`,\n        },\n        { status: 409 }\n      )\n    }\n\n    const guardResult = await validateCrudMutationGuard(container, {\n      tenantId: tenantId ?? '',\n      organizationId: organizationId ?? null,\n      userId: auth.sub ?? '',\n      resourceKind: 'workflows.definition',\n      resourceId: String(definition.id),\n      operation: 'custom',\n      requestMethod: 'POST',\n      requestHeaders: request.headers,\n    })\n    if (guardResult && !guardResult.ok) {\n      return NextResponse.json(guardResult.body, { status: guardResult.status })\n    }\n\n    // Look up the original code definition before deleting\n    const codeDef = getCodeWorkflow(definition.codeWorkflowId)\n\n    // Snapshot identifying fields before remove() detaches the entity\n    const removedSnapshot = {\n      id: String(definition.id),\n      workflowId: definition.workflowId,\n      codeWorkflowId: definition.codeWorkflowId,\n      tenantId: definition.tenantId,\n      organizationId: definition.organizationId,\n    }\n\n    // Hard-delete the DB override row\n    em.remove(definition)\n    await em.flush()\n\n    // Trigger ownership falls back to the code registry, so the cached snapshot\n    // still holds the embedded triggers of a row that no longer exists (#4425).\n    if (removedSnapshot.tenantId) {\n      invalidateTriggerCache(removedSnapshot.tenantId, removedSnapshot.organizationId ?? undefined)\n    }\n\n    if (guardResult?.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: tenantId ?? '',\n        organizationId: organizationId ?? null,\n        userId: auth.sub ?? '',\n        resourceKind: 'workflows.definition',\n        resourceId: removedSnapshot.id,\n        operation: 'custom',\n        requestMethod: 'POST',\n        requestHeaders: request.headers,\n        metadata: guardResult.metadata,\n      })\n    }\n\n    try {\n      const eventBus = container.resolve('eventBus') as\n        | { emitEvent(event: string, payload: unknown, options?: unknown): Promise<void> }\n        | undefined\n      if (eventBus && typeof eventBus.emitEvent === 'function') {\n        await eventBus.emitEvent(\n          'workflows.definition.reset_to_code',\n          {\n            id: removedSnapshot.id,\n            workflowId: removedSnapshot.workflowId,\n            codeWorkflowId: removedSnapshot.codeWorkflowId,\n            tenantId: removedSnapshot.tenantId,\n            organizationId: removedSnapshot.organizationId,\n            userId: auth.sub ?? null,\n          },\n          {\n            tenantId: removedSnapshot.tenantId,\n            organizationId: removedSnapshot.organizationId,\n            persistent: true,\n          },\n        )\n      }\n    } catch (eventError) {\n      logger.error('Failed to emit workflows.definition.reset_to_code event', { err: eventError })\n    }\n\n    if (!codeDef) {\n      return NextResponse.json({\n        message: 'Workflow definition reset to code version (code definition no longer registered)',\n        data: null,\n      })\n    }\n\n    const syntheticId = `code:${codeDef.workflowId}`\n\n    return NextResponse.json({\n      data: serializeCodeWorkflowDefinition(codeDef, syntheticId),\n      message: 'Workflow definition reset to code version',\n    })\n  } catch (error) {\n    logger.error('Error resetting workflow definition to code', { err: error })\n    return NextResponse.json(\n      { error: 'Failed to reset workflow definition to code' },\n      { status: 500 }\n    )\n  }\n}\n\nexport const openApi = {\n  methods: {\n    POST: {\n      summary: 'Reset workflow definition to code version',\n      description: 'Deletes the DB override for a code-based workflow definition, reverting it to the original code registry version. Cannot be reset if there are active instances.',\n      tags: ['Workflows'],\n      pathParams: z.object({\n        id: z.string().uuid(),\n      }),\n      responses: [\n        {\n          status: 200,\n          description: 'Workflow definition reset to code version',\n          example: {\n            data: {\n              id: 'code:checkout-flow',\n              workflowId: 'checkout-flow',\n              workflowName: 'Checkout Flow',\n              description: 'Code-defined checkout workflow',\n              version: 1,\n              source: 'code',\n              isCodeBased: true,\n            },\n            message: 'Workflow definition reset to code version',\n          },\n        },\n        {\n          status: 400,\n          description: 'Definition is not a code-based override',\n          example: {\n            error: 'This workflow definition is not a code-based override and cannot be reset',\n          },\n        },\n        {\n          status: 404,\n          description: 'Workflow definition not found',\n          example: {\n            error: 'Workflow definition not found',\n          },\n        },\n        {\n          status: 409,\n          description: 'Cannot reset - active workflow instances exist',\n          example: {\n            error: 'Cannot reset workflow definition with 3 active instance(s)',\n          },\n        },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.7-develop.6653.1.b5bc7194a0",
+  "version": "0.6.7-develop.6660.1.90e1e2eef6",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -254,16 +254,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.7-develop.6653.1.b5bc7194a0",
-    "@open-mercato/shared": "0.6.7-develop.6653.1.b5bc7194a0",
-    "@open-mercato/ui": "0.6.7-develop.6653.1.b5bc7194a0",
+    "@open-mercato/ai-assistant": "0.6.7-develop.6660.1.90e1e2eef6",
+    "@open-mercato/shared": "0.6.7-develop.6660.1.90e1e2eef6",
+    "@open-mercato/ui": "0.6.7-develop.6660.1.90e1e2eef6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.7-develop.6653.1.b5bc7194a0",
-    "@open-mercato/shared": "0.6.7-develop.6653.1.b5bc7194a0",
-    "@open-mercato/ui": "0.6.7-develop.6653.1.b5bc7194a0",
+    "@open-mercato/ai-assistant": "0.6.7-develop.6660.1.90e1e2eef6",
+    "@open-mercato/shared": "0.6.7-develop.6660.1.90e1e2eef6",
+    "@open-mercato/ui": "0.6.7-develop.6660.1.90e1e2eef6",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/business_rules/lib/value-resolver.ts

@@ -26,9 +26,17 @@ export function resolveSpecialValue(template: string, context: EvaluationContext
   return getNestedValue(context, path)
 }
 
+// Field paths come from rule authors, so a segment could name a prototype key.
+// Rejecting these — and requiring own-property access — keeps traversal on the
+// caller's own data instead of the prototype chain.
+const DANGEROUS_KEYS = new Set<string>(['__proto__', 'constructor', 'prototype'])
+
 /**
  * Get nested value from object using dot notation
  * Supports: 'user.name', 'items[0].quantity', 'data.values[2]'
+ *
+ * Segments naming a prototype key, or resolving to an inherited rather than an
+ * own property, yield `undefined`.
  */
 export function getNestedValue(obj: any, path: string): any {
   if (!obj || !path) {
@@ -46,6 +54,14 @@ export function getNestedValue(obj: any, path: string): any {
       return undefined
     }
 
+    if (DANGEROUS_KEYS.has(key)) {
+      return undefined
+    }
+
+    if (!Object.prototype.hasOwnProperty.call(result, key)) {
+      return undefined
+    }
+
     result = result[key]
   }
 

package/src/modules/currencies/commands/currencies.ts

@@ -18,6 +18,7 @@ import {
 } from '../data/validators'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import { buildCurrencyCommandWhere, ensureCurrencyCommandScope } from './scope'
 
 const currencyCrudEvents: CrudEventsConfig = {
   module: 'currencies',
@@ -48,9 +49,17 @@ type CurrencySnapshot = {
 
 type CurrencyUndoPayload = UndoPayload<CurrencySnapshot>
 
-async function loadCurrencySnapshot(em: EntityManager, id: string): Promise<CurrencySnapshot | null> {
-  const record = await em.findOne(Currency, { id })
+async function loadCurrencySnapshot(
+  em: EntityManager,
+  id: string,
+  ctx: Parameters<typeof buildCurrencyCommandWhere>[0],
+): Promise<CurrencySnapshot | null> {
+  const record = await em.findOne(
+    Currency,
+    buildCurrencyCommandWhere<Currency>(ctx, { id }),
+  )
   if (!record) return null
+  ensureCurrencyCommandScope(ctx, record)
   return {
     id: record.id,
     organizationId: record.organizationId,
@@ -91,6 +100,7 @@ const createCurrencyCommand: CommandHandler<CurrencyCreateInput, { currencyId: s
   id: 'currencies.currencies.create',
   async execute(input, ctx) {
     const parsed = currencyCreateSchema.parse(input)
+    ensureCurrencyCommandScope(ctx, parsed)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
 
@@ -159,7 +169,7 @@ const createCurrencyCommand: CommandHandler<CurrencyCreateInput, { currencyId: s
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return loadCurrencySnapshot(em, result.currencyId)
+    return loadCurrencySnapshot(em, result.currencyId, ctx)
   },
   buildLog: async ({ snapshots }) => {
     const after = snapshots.after as CurrencySnapshot | undefined
@@ -204,7 +214,7 @@ const updateCurrencyCommand: CommandHandler<CurrencyUpdateInput, { currencyId: s
   async prepare(input, ctx) {
     requireId(input.id, 'Currency ID is required')
     const em = ctx.container.resolve('em') as EntityManager
-    const before = await loadCurrencySnapshot(em, input.id)
+    const before = await loadCurrencySnapshot(em, input.id, ctx)
     return { before }
   },
   async execute(input, ctx) {
@@ -212,10 +222,14 @@ const updateCurrencyCommand: CommandHandler<CurrencyUpdateInput, { currencyId: s
     requireId(parsed.id, 'Currency ID is required')
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const record = await em.findOne(Currency, { id: parsed.id, deletedAt: null })
+    const record = await em.findOne(
+      Currency,
+      buildCurrencyCommandWhere<Currency>(ctx, { id: parsed.id }),
+    )
     if (!record) {
       throw new CrudHttpError(404, { error: 'Currency not found' })
     }
+    ensureCurrencyCommandScope(ctx, record)
 
     // Check code uniqueness if changing code
     if (parsed.code && parsed.code !== record.code) {
@@ -289,7 +303,7 @@ const updateCurrencyCommand: CommandHandler<CurrencyUpdateInput, { currencyId: s
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return loadCurrencySnapshot(em, result.currencyId)
+    return loadCurrencySnapshot(em, result.currencyId, ctx)
   },
   buildLog: async ({ snapshots, result }) => {
     const before = snapshots.before as CurrencySnapshot | undefined
@@ -334,7 +348,7 @@ const deleteCurrencyCommand: CommandHandler<CurrencyDeleteInput, { currencyId: s
   async prepare(input, ctx) {
     requireId(input.id, 'Currency ID is required')
     const em = ctx.container.resolve('em') as EntityManager
-    const before = await loadCurrencySnapshot(em, input.id)
+    const before = await loadCurrencySnapshot(em, input.id, ctx)
     return { before }
   },
   async execute(input, ctx) {
@@ -342,10 +356,14 @@ const deleteCurrencyCommand: CommandHandler<CurrencyDeleteInput, { currencyId: s
     requireId(parsed.id, 'Currency ID is required')
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const record = await em.findOne(Currency, { id: parsed.id, deletedAt: null })
+    const record = await em.findOne(
+      Currency,
+      buildCurrencyCommandWhere<Currency>(ctx, { id: parsed.id }),
+    )
     if (!record) {
       throw new CrudHttpError(404, { error: 'Currency not found' })
     }
+    ensureCurrencyCommandScope(ctx, record)
 
     // Prevent deleting base currency
     if (record.isBase) {

package/src/modules/currencies/commands/exchange-rates.ts

@@ -17,6 +17,7 @@ import {
 } from '../data/validators'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import { buildCurrencyCommandWhere, ensureCurrencyCommandScope } from './scope'
 
 const exchangeRateCrudEvents: CrudEventsConfig = {
   module: 'currencies',
@@ -46,9 +47,17 @@ type ExchangeRateSnapshot = {
 
 type ExchangeRateUndoPayload = UndoPayload<ExchangeRateSnapshot>
 
-async function loadExchangeRateSnapshot(em: EntityManager, id: string): Promise<ExchangeRateSnapshot | null> {
-  const record = await em.findOne(ExchangeRate, { id })
+async function loadExchangeRateSnapshot(
+  em: EntityManager,
+  id: string,
+  ctx: Parameters<typeof buildCurrencyCommandWhere>[0],
+): Promise<ExchangeRateSnapshot | null> {
+  const record = await em.findOne(
+    ExchangeRate,
+    buildCurrencyCommandWhere<ExchangeRate>(ctx, { id }),
+  )
   if (!record) return null
+  ensureCurrencyCommandScope(ctx, record)
   return {
     id: record.id,
     organizationId: record.organizationId,
@@ -97,6 +106,7 @@ const createExchangeRateCommand: CommandHandler<ExchangeRateCreateInput, { excha
   id: 'currencies.exchange_rates.create',
   async execute(input, ctx) {
     const parsed = exchangeRateCreateSchema.parse(input)
+    ensureCurrencyCommandScope(ctx, parsed)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
 
@@ -158,7 +168,7 @@ const createExchangeRateCommand: CommandHandler<ExchangeRateCreateInput, { excha
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return loadExchangeRateSnapshot(em, result.exchangeRateId)
+    return loadExchangeRateSnapshot(em, result.exchangeRateId, ctx)
   },
   buildLog: async ({ snapshots }) => {
     const after = snapshots.after as ExchangeRateSnapshot | undefined
@@ -198,7 +208,7 @@ const updateExchangeRateCommand: CommandHandler<ExchangeRateUpdateInput, { excha
   async prepare(input, ctx) {
     requireId(input.id, 'Exchange rate ID is required')
     const em = ctx.container.resolve('em') as EntityManager
-    const before = await loadExchangeRateSnapshot(em, input.id)
+    const before = await loadExchangeRateSnapshot(em, input.id, ctx)
     return { before }
   },
   async execute(input, ctx) {
@@ -206,10 +216,14 @@ const updateExchangeRateCommand: CommandHandler<ExchangeRateUpdateInput, { excha
     requireId(parsed.id, 'Exchange rate ID is required')
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const record = await em.findOne(ExchangeRate, { id: parsed.id, deletedAt: null })
+    const record = await em.findOne(
+      ExchangeRate,
+      buildCurrencyCommandWhere<ExchangeRate>(ctx, { id: parsed.id }),
+    )
     if (!record) {
       throw new CrudHttpError(404, { error: 'Exchange rate not found' })
     }
+    ensureCurrencyCommandScope(ctx, record)
 
     // Validate currencies if changed
     const fromCode = parsed.fromCurrencyCode ?? record.fromCurrencyCode
@@ -288,7 +302,7 @@ const updateExchangeRateCommand: CommandHandler<ExchangeRateUpdateInput, { excha
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return loadExchangeRateSnapshot(em, result.exchangeRateId)
+    return loadExchangeRateSnapshot(em, result.exchangeRateId, ctx)
   },
   buildLog: async ({ snapshots, result }) => {
     const before = snapshots.before as ExchangeRateSnapshot | undefined
@@ -332,7 +346,7 @@ const deleteExchangeRateCommand: CommandHandler<ExchangeRateDeleteInput, { excha
   async prepare(input, ctx) {
     requireId(input.id, 'Exchange rate ID is required')
     const em = ctx.container.resolve('em') as EntityManager
-    const before = await loadExchangeRateSnapshot(em, input.id)
+    const before = await loadExchangeRateSnapshot(em, input.id, ctx)
     return { before }
   },
   async execute(input, ctx) {
@@ -340,10 +354,14 @@ const deleteExchangeRateCommand: CommandHandler<ExchangeRateDeleteInput, { excha
     requireId(parsed.id, 'Exchange rate ID is required')
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const record = await em.findOne(ExchangeRate, { id: parsed.id, deletedAt: null })
+    const record = await em.findOne(
+      ExchangeRate,
+      buildCurrencyCommandWhere<ExchangeRate>(ctx, { id: parsed.id }),
+    )
     if (!record) {
       throw new CrudHttpError(404, { error: 'Exchange rate not found' })
     }
+    ensureCurrencyCommandScope(ctx, record)
 
     record.deletedAt = new Date()
     record.isActive = false

package/src/modules/currencies/commands/scope.ts

@@ -0,0 +1,32 @@
+import type { FilterQuery } from '@mikro-orm/core'
+import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
+import { buildScopedWhere } from '@open-mercato/shared/lib/api/crud'
+import {
+  ensureOrganizationScope,
+  ensureTenantScope,
+} from '@open-mercato/shared/lib/commands/scope'
+
+type CurrencyCommandScopedRecord = {
+  organizationId: string
+  tenantId: string
+}
+
+export function buildCurrencyCommandWhere<T extends object>(
+  ctx: CommandRuntimeContext,
+  base: FilterQuery<T>,
+): FilterQuery<T> {
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? undefined
+  return buildScopedWhere(base as Record<string, unknown>, {
+    organizationId,
+    organizationIds: ctx.organizationIds ?? undefined,
+    tenantId: ctx.auth?.tenantId ?? undefined,
+  }) as FilterQuery<T>
+}
+
+export function ensureCurrencyCommandScope(
+  ctx: CommandRuntimeContext,
+  record: CurrencyCommandScopedRecord,
+): void {
+  ensureTenantScope(ctx, record.tenantId)
+  ensureOrganizationScope(ctx, record.organizationId)
+}

package/src/modules/customers/components/detail/ActivitiesSection.tsx

@@ -36,6 +36,8 @@ export type ActivitiesSectionProps = {
   runGuardedMutation?: GuardedMutationRunner
   refreshKey?: number
   onEditActivity?: (activity: InteractionSummary) => void
+  /** Interaction type hidden from the timeline by default ('task' unless overridden); pass null to show every type. */
+  excludeInteractionType?: string | null
 }
 
 function toDateOnly(value: string | null | undefined): string {
@@ -109,6 +111,7 @@ export function ActivitiesSection({
   refreshKey = 0,
   onEditActivity,
   runGuardedMutation,
+  excludeInteractionType = 'task',
 }: ActivitiesSectionProps) {
   const t = useT()
   const [filterTypes, setFilterTypes] = React.useState<string[]>([])
@@ -169,17 +172,18 @@ export function ActivitiesSection({
     setLoading(true)
     try {
       // Always fetch canonical interactions (new activities are always created here)
-      const taskFilterActive = filterTypes.includes('task')
+      const excludedFilterActive = excludeInteractionType ? filterTypes.includes(excludeInteractionType) : true
       const canonicalParams = new URLSearchParams({
         entityId,
         limit: '50',
         sortField: 'occurredAt',
         sortDir: 'desc',
       })
-      // Hide tasks from the activity timeline by default — they have their own tab —
-      // but lift the exclusion when the user explicitly toggled the Task chip on
-      // (mirrors `ActivityHistorySection.tsx` after the #1805 fix).
-      if (!taskFilterActive) canonicalParams.set('excludeInteractionType', 'task')
+      // Hide the configured type (tasks by default — they have their own tab)
+      // from the activity timeline, but lift the exclusion when the user
+      // explicitly toggled that type's chip on (mirrors
+      // `ActivityHistorySection.tsx` after the #1805 fix).
+      if (excludeInteractionType && !excludedFilterActive) canonicalParams.set('excludeInteractionType', excludeInteractionType)
       if (dealId) canonicalParams.set('dealId', dealId)
       if (filterTypes.length > 0) canonicalParams.set('type', filterTypes.join(','))
       if (filterDateFrom) canonicalParams.set('from', filterDateFrom)
@@ -261,7 +265,7 @@ export function ActivitiesSection({
     } finally {
       setLoading(false)
     }
-  }, [dealId, entityId, filterDateFrom, filterDateTo, filterTypes, loadedPages, useCanonicalInteractions, refreshKey, t])
+  }, [dealId, entityId, excludeInteractionType, filterDateFrom, filterDateTo, filterTypes, loadedPages, useCanonicalInteractions, refreshKey, t])
 
   React.useEffect(() => {
     setLoadedPages(1)

package/src/modules/customers/components/detail/ActivityHistorySection.tsx

@@ -30,6 +30,8 @@ type ActivityHistorySectionProps = {
   /** Optional guarded-mutation runner so per-row mutations route through the parent's
    * `useGuardedMutation` and emit retry-last-mutation context. */
   runMutation?: GuardedMutationRunner
+  /** Interaction type hidden from the history by default ('task' unless overridden); pass null to show every type. */
+  excludeInteractionType?: string | null
 }
 
 type InteractionListResponse = {
@@ -170,6 +172,7 @@ export function ActivityHistorySection({
   refreshKey = 0,
   onEditActivity,
   runMutation,
+  excludeInteractionType = 'task',
 }: ActivityHistorySectionProps) {
   const t = useT()
   const [searchInput, setSearchInput] = React.useState('')
@@ -231,14 +234,14 @@ export function ActivityHistorySection({
       let firstPageHasMore = false
       let pagesLoaded = 0
 
-      const taskFilterActive = activeTypes.includes('task')
+      const excludedFilterActive = excludeInteractionType ? activeTypes.includes(excludeInteractionType) : true
       do {
         const params = new URLSearchParams({
           entityId,
           limit: String(pageSize),
           from: rangeStart,
         })
-        if (!taskFilterActive) params.set('excludeInteractionType', 'task')
+        if (excludeInteractionType && !excludedFilterActive) params.set('excludeInteractionType', excludeInteractionType)
         if (activeTypes.length > 0) params.set('type', activeTypes.join(','))
         if (search) params.set('search', search)
         if (sortMode === 'recent') {
@@ -310,7 +313,7 @@ export function ActivityHistorySection({
     } finally {
       if (!isStale()) setLoading(false)
     }
-  }, [activeTypes, dateRange, entityId, loadedPages, search, sortMode, t, useCanonicalInteractions])
+  }, [activeTypes, dateRange, entityId, excludeInteractionType, loadedPages, search, sortMode, t, useCanonicalInteractions])
 
   React.useEffect(() => {
     const controller = new AbortController()

package/src/modules/feature_toggles/api/global/route.ts

@@ -103,13 +103,19 @@ const crud = makeCrudRoute({
     entity: FeatureToggle,
     idField: 'id',
     orgField: null,
-    tenantField: "tenantId",
+    // The query engine requires the caller's tenant context even when the
+    // underlying entity is global; the list below explicitly disables its
+    // automatic tenant predicate.
+    tenantField: 'tenantId',
     softDeleteField: 'deletedAt'
   },
   indexer: { entityType: E.feature_toggles.feature_toggle },
   list: {
     schema: listQuerySchema,
     entityId: E.feature_toggles.feature_toggle,
+    // FeatureToggle rows and their query-index projections are global
+    // (null/null scope), so filtering them by the actor's tenant hides them.
+    omitAutomaticTenantOrgScope: true,
     fields: listFields,
     sortFieldMap: {
       id: 'id',

package/src/modules/feature_toggles/commands/global.ts

@@ -52,14 +52,11 @@ const featureToggleCrudIndexer = { entityType: E.feature_toggles.feature_toggle
 
 const FEATURE_TOGGLE_LOCK_RESOURCE_KIND = 'feature_toggles.feature_toggle'
 
-function featureToggleIdentifiers(
-  toggle: FeatureToggle | ToggleSnapshot,
-  ctx: { auth?: { tenantId?: string | null } | null },
-) {
+function featureToggleIdentifiers(toggle: FeatureToggle | ToggleSnapshot) {
   return {
     id: toggle.id,
     organizationId: null,
-    tenantId: ctx.auth?.tenantId ?? null,
+    tenantId: null,
   }
 }
 
@@ -113,7 +110,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
       dataEngine,
       action: 'created',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -157,7 +154,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
         dataEngine,
         action: 'deleted',
         entity: toggle,
-        identifiers: featureToggleIdentifiers(toggle, ctx),
+        identifiers: featureToggleIdentifiers(toggle),
         syncOrigin: ctx.syncOrigin,
         indexer: featureToggleCrudIndexer,
       })
@@ -196,7 +193,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
       dataEngine,
       action: 'created',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -245,7 +242,7 @@ const updateToggleCommand: CommandHandler<ToggleUpdateInput, { toggleId: string
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -328,7 +325,7 @@ const updateToggleCommand: CommandHandler<ToggleUpdateInput, { toggleId: string
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -369,7 +366,7 @@ const deleteToggleCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       dataEngine,
       action: 'deleted',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -443,7 +440,7 @@ const deleteToggleCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })