@porulle/core 0.10.8 → 0.13.0

package/dist/modules/pricing/service.js

@@ -1,10 +1,10 @@
-import { resolveOrgId } from "../../auth/org.js";
+import { resolveOrgIdForCommerce } from "../../auth/org.js";
 import { CommerceNotFoundError, CommerceValidationError, } from "../../kernel/errors.js";
 import { runAfterHooks } from "../../kernel/hooks/executor.js";
 import { createHookContext } from "../../kernel/hooks/create-context.js";
 import { Err, Ok } from "../../kernel/result.js";
 import { createLogger } from "../../utils/logger.js";
-function hookContext(actor, services, database, tx) {
+function hookContext(actor, services, database, config, tx) {
     return createHookContext({
         actor,
         tx,
@@ -12,6 +12,7 @@ function hookContext(actor, services, database, tx) {
         services,
         context: { moduleName: "pricing" },
         database: { db: database.db },
+        commerceConfig: config,
     });
 }
 function matchesQuantity(min, max, quantity) {
@@ -103,7 +104,7 @@ export class PricingService {
         if (input.amount < 0) {
             return Err(new CommerceValidationError("Base price amount cannot be negative."));
         }
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
         if (!entity) {
             return Err(new CommerceNotFoundError("Entity not found for price assignment."));
@@ -113,6 +114,7 @@ export class PricingService {
             entityId: input.entityId,
             currency: normalizeCurrency(input.currency),
             amount: input.amount,
+            ...(input.compareAtAmount !== undefined ? { compareAtAmount: input.compareAtAmount } : {}),
             metadata: input.metadata ?? {},
             variantId: input.variantId ?? null,
             customerGroupId: input.customerGroupId ?? null,
@@ -133,10 +135,14 @@ export class PricingService {
             sameNaturalKeyDate(p.validFrom, priceData.validFrom ?? null) &&
             sameNaturalKeyDate(p.validUntil, priceData.validUntil ?? null));
         const record = existing
-            ? (await this.repo.updatePrice(existing.id, { amount: priceData.amount, metadata: priceData.metadata }, ctx)) ?? existing
+            ? (await this.repo.updatePrice(existing.id, {
+                amount: priceData.amount,
+                ...(priceData.compareAtAmount !== undefined ? { compareAtAmount: priceData.compareAtAmount } : {}),
+                metadata: priceData.metadata,
+            }, ctx)) ?? existing
             : await this.repo.createPrice(priceData, ctx);
         const afterHooks = this.deps.hooks.resolve("pricing.afterCreate");
-        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
         await runAfterHooks(afterHooks, null, record, "create", hctx);
         return Ok(record);
     }
@@ -154,7 +160,7 @@ export class PricingService {
         if (!validTypes.includes(input.type)) {
             return Err(new CommerceValidationError(`Invalid modifier type "${input.type}". Must be one of: ${validTypes.join(", ")}`));
         }
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const modifierData = {
             organizationId: orgId,
             name: input.name,
@@ -174,12 +180,12 @@ export class PricingService {
         };
         const modifier = await this.repo.createModifier(modifierData, ctx);
         const afterHooks = this.deps.hooks.resolve("pricing.afterCreate");
-        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
         await runAfterHooks(afterHooks, null, modifier, "create", hctx);
         return Ok(modifier);
     }
     async listModifiers(filter, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const rows = await this.repo.findModifiers(orgId, {
             ...(filter?.entityId !== undefined ? { entityId: filter.entityId } : {}),
             ...(filter?.currency !== undefined
@@ -190,7 +196,7 @@ export class PricingService {
         return Ok(rows);
     }
     async updateModifier(id, patch, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const existing = await this.repo.findModifierById(orgId, id, ctx);
         if (!existing) {
             return Err(new CommerceNotFoundError("Price modifier not found."));
@@ -208,7 +214,7 @@ export class PricingService {
         return Ok(updated);
     }
     async deleteModifier(id, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const existing = await this.repo.findModifierById(orgId, id, ctx);
         if (!existing) {
             return Err(new CommerceNotFoundError("Price modifier not found."));
@@ -217,7 +223,7 @@ export class PricingService {
         return Ok({ deleted: true });
     }
     async listPrices(filter, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         // Get all prices for the entity if specified, or filter after retrieval
         let prices = [];
         if (filter?.entityId) {
@@ -256,7 +262,7 @@ export class PricingService {
         return Ok({ prices, modifiers });
     }
     async resolve(input, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
         if (!entity) {
             return Err(new CommerceNotFoundError(`Entity ${input.entityId} not found.`));

package/dist/modules/promotions/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/promotions/module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBACb,OAAO,UAAU;qBAAmB,OAAO,eAAe;0CAgBxE,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/promotions/module.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBACb,OAAO,UAAU;qBAAmB,OAAO,eAAe;0CAiBxE,CAAC"}

package/dist/modules/promotions/module.js

@@ -12,6 +12,7 @@ export const promotionsModule = defineModule({
         catalogRepository: deps.services.catalog.repository,
         ordersRepository: new OrdersRepository(deps.db.db),
         hooks: deps.hooks,
+        config: deps.config,
         services: deps.services,
         database: deps.db,
     }),

package/dist/modules/promotions/service.d.ts

@@ -6,6 +6,7 @@ import type { PromotionsRepository, Promotion, PromotionUsage } from "./reposito
 import type { CatalogRepository } from "../catalog/repository/index.js";
 import type { OrdersRepository } from "../orders/repository/index.js";
 import type { Actor } from "../../auth/types.js";
+import type { CommerceConfig } from "../../config/types.js";
 import { type PromotionType } from "./schemas.js";
 export type { PromotionType };
 /** Filter status for listing promotions. Used by the REST API and service layer. */
@@ -15,6 +16,7 @@ interface PromotionServiceDeps {
     catalogRepository: CatalogRepository;
     ordersRepository: OrdersRepository;
     hooks: HookRegistry;
+    config: CommerceConfig;
     services: Record<string, unknown>;
     database: DatabaseAdapter;
 }
@@ -69,6 +71,7 @@ export declare class PromotionService {
     private readonly catalogRepo;
     private readonly ordersRepo;
     constructor(deps: PromotionServiceDeps);
+    private resolveEvaluationOrgId;
     create(input: CreatePromotionInput, actor?: Actor | null, ctx?: TxContext): Promise<Result<Promotion>>;
     deactivate(orgId: string, id: string, ctx?: TxContext): Promise<Result<Promotion>>;
     /**

package/dist/modules/promotions/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/promotions/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAOrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EACV,oBAAoB,EACpB,SAAS,EACT,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AACrE,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,oFAAoF;AACpF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;AAEpF,UAAU,oBAAoB;IAC5B,UAAU,EAAE,oBAAoB,CAAC;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAkBD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAE/E,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,aAAa,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxD;AAqDD,qBAAa,gBAAgB;IAKf,OAAO,CAAC,IAAI;IAJxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAuB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;gBAE1B,IAAI,EAAE,oBAAoB;IAMxC,MAAM,CACV,KAAK,EAAE,oBAAoB,EAC3B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAsEvB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAoBxF;;;OAGG;IACG,MAAM,CACV,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,oBAAoB,EAC3B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAwEvB,IAAI,CACR,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,qBAAqB,CAAA;KAAE,EAC3C,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAyBzB,UAAU,CACd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,SAAS,OAAa,EACtB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAQzB,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,0BAA0B,EACnC,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAsBvB,KAAK,CACT,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,0BAA0B,EACnC,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAiBxC,eAAe,CACnB,OAAO,EAAE,0BAA0B,EACnC,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAiExC,WAAW,CACf,KAAK,EAAE;QACL,UAAU,EAAE,gBAAgB,EAAE,CAAC;QAC/B,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;YAiBtB,2BAA2B;YA0F3B,kBAAkB;YAuBlB,iBAAiB;YA2EjB,uBAAuB;CAmCtC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/promotions/service.ts"],"names":[],"mappings":"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"}

package/dist/modules/promotions/service.js

@@ -3,11 +3,11 @@ import { runAfterHooks } from "../../kernel/hooks/executor.js";
 import { createHookContext } from "../../kernel/hooks/create-context.js";
 import { Err, Ok } from "../../kernel/result.js";
 import { createLogger } from "../../utils/logger.js";
-import { resolveOrgId } from "../../auth/org.js";
+import { resolveOrgId, resolveOrgIdForCommerce } from "../../auth/org.js";
 // PromotionType is derived from the zod enum (single source of truth) in
 // ./schemas.js; re-export it here for backwards-compatible imports.
 import { promotionTypeEnum } from "./schemas.js";
-function hookContext(actor, services, database, tx) {
+function hookContext(actor, services, database, config, tx) {
     return createHookContext({
         actor,
         tx,
@@ -15,6 +15,7 @@ function hookContext(actor, services, database, tx) {
         services,
         context: { moduleName: "promotions" },
         database: { db: database.db },
+        commerceConfig: config,
     });
 }
 function matchesWindow(promotion, timestamp) {
@@ -70,6 +71,12 @@ export class PromotionService {
         this.catalogRepo = deps.catalogRepository;
         this.ordersRepo = deps.ordersRepository;
     }
+    resolveEvaluationOrgId(ctx, explicitOrgId) {
+        if (explicitOrgId) {
+            return resolveOrgId(ctx?.actor ?? null, explicitOrgId);
+        }
+        return resolveOrgIdForCommerce(ctx?.actor ?? null, this.deps.config);
+    }
     async create(input, actor, ctx) {
         if (!input.name) {
             return Err(new CommerceValidationError("Promotion name is required."));
@@ -82,7 +89,7 @@ export class PromotionService {
         if (!validTypes.includes(input.type)) {
             return Err(new CommerceValidationError(`Invalid promotion type "${input.type}". Must be one of: ${validTypes.join(", ")}`));
         }
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         if (input.code) {
             const normalized = input.code.trim().toUpperCase();
             const existing = await this.repo.findByCode(orgId, normalized, ctx);
@@ -109,7 +116,7 @@ export class PromotionService {
             validUntil: input.validUntil ?? null,
         }, ctx);
         const afterHooks = this.deps.hooks.resolve("promotions.afterCreate");
-        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
         await runAfterHooks(afterHooks, null, promotion, "create", hctx);
         return Ok(promotion);
     }
@@ -123,7 +130,8 @@ export class PromotionService {
             return Err(new CommerceNotFoundError("Promotion not found."));
         }
         const afterHooks = this.deps.hooks.resolve("promotions.afterUpdate");
-        const hctx = hookContext(null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+        // Actor-less by design; resolves to the deployment's declared organization.
+        const hctx = hookContext(null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
         await runAfterHooks(afterHooks, promotion, updated, "update", hctx);
         return Ok(updated);
     }
@@ -192,12 +200,12 @@ export class PromotionService {
             return Err(new CommerceNotFoundError("Promotion not found."));
         }
         const afterHooks = this.deps.hooks.resolve("promotions.afterUpdate");
-        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, ctx?.tx ?? null);
+        const hctx = hookContext(actor ?? ctx?.actor ?? null, this.deps.services, this.deps.database, this.deps.config, ctx?.tx ?? null);
         await runAfterHooks(afterHooks, existing, updated, "update", hctx);
         return Ok(updated);
     }
     async list(filter, actor, ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const all = await this.repo.findAll(orgId, ctx);
         const now = new Date();
         if (!filter?.status)
@@ -218,7 +226,7 @@ export class PromotionService {
         return Ok(sortByPriority(filtered));
     }
     async listActive(actor, timestamp = new Date(), ctx) {
-        const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
+        const orgId = resolveOrgIdForCommerce(actor ?? ctx?.actor ?? null, this.deps.config);
         const active = await this.repo.findActive(orgId, ctx);
         // Further filter by timestamp in case repo returns slightly stale results
         const filtered = active.filter((p) => matchesWindow(p, timestamp));
@@ -226,7 +234,7 @@ export class PromotionService {
     }
     async validate(code, context, ctx) {
         const normalized = code.trim().toUpperCase();
-        const evalOrgId = resolveOrgId(ctx?.actor ?? null, context.orgId);
+        const evalOrgId = this.resolveEvaluationOrgId(ctx, context.orgId);
         const promotion = await this.repo.findByCode(evalOrgId, normalized, ctx);
         if (!promotion) {
             return Err(new CommerceNotFoundError(`Promotion code ${normalized} not found.`));
@@ -251,7 +259,7 @@ export class PromotionService {
     }
     async applyPromotions(context, ctx) {
         const timestamp = context.timestamp ?? new Date();
-        const applyOrgId = resolveOrgId(ctx?.actor ?? null, context.orgId);
+        const applyOrgId = this.resolveEvaluationOrgId(ctx, context.orgId);
         const result = {
             totalDiscount: 0,
             freeShipping: false,
@@ -341,7 +349,7 @@ export class PromotionService {
             if (!context.customerId) {
                 return "First-order promotion requires authenticated customer.";
             }
-            const orders = await this.ordersRepo.findByCustomerId(resolveOrgId(ctx?.actor ?? null, context.orgId), context.customerId, ctx);
+            const orders = await this.ordersRepo.findByCustomerId(this.resolveEvaluationOrgId(ctx, context.orgId), context.customerId, ctx);
             if (orders.length > 0) {
                 return "Promotion is valid for first order only.";
             }

package/dist/modules/search/adapter.d.ts

@@ -1,21 +1,27 @@
 import type { Result } from "../../kernel/result.js";
 export interface SearchDocument {
     id: string;
+    organizationId?: string;
     type: string;
     slug: string;
     title: string;
     description?: string;
     status?: string;
+    isVisible?: boolean;
     categories: string[];
     brands: string[];
     text: string;
+    attributes?: Record<string, string | string[]>;
     payload?: Record<string, unknown>;
 }
 export interface SearchFilters {
+    /** Server-supplied tenant constraint; REST callers cannot choose this value. */
+    organizationId?: string;
     type?: string;
     category?: string;
     brand?: string;
     status?: string;
+    attributes?: Record<string, string | string[]>;
 }
 export interface SearchQueryParams {
     query: string;
@@ -28,6 +34,8 @@ export interface SearchSuggestParams {
     prefix: string;
     type?: string;
     limit?: number;
+    /** Server-supplied tenant constraint; REST callers cannot choose this value. */
+    organizationId?: string;
 }
 export interface SearchHit {
     id: string;

package/dist/modules/search/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/modules/search/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CACjE"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/modules/search/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CACjE"}

package/dist/modules/search/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/search/module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,YAAY,2GAgBxB,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/search/module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,YAAY,2GAmBxB,CAAC"}

package/dist/modules/search/module.js

@@ -8,6 +8,9 @@ export const searchModule = defineModule({
         const config = deps.config;
         return new SearchService({
             catalogRepository: deps.services.catalog.repository,
+            resolveEntityFieldDefinitions: deps.services.catalog.resolveEntityFieldDefinitions.bind(deps.services.catalog),
+            config,
+            ...(config.entities ? { entities: config.entities } : {}),
             ...(config.search?.adapter ? { adapter: config.search.adapter } : {}),
             ...(config.search?.defaultFacets
                 ? { defaultFacets: config.search.defaultFacets }

package/dist/modules/search/service.d.ts

@@ -1,9 +1,14 @@
 import { type Result } from "../../kernel/result.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
+import type { CommerceConfig } from "../../config/types.js";
 import type { CatalogRepository } from "../catalog/repository/index.js";
 import type { SearchAdapter, SearchQueryParams, SearchQueryResult, SearchSuggestParams } from "./adapter.js";
+import type { EntityFieldDefinitionResolver } from "../catalog/service.js";
 interface SearchServiceDeps {
     catalogRepository: CatalogRepository;
+    config: CommerceConfig;
+    entities?: CommerceConfig["entities"];
+    resolveEntityFieldDefinitions?: EntityFieldDefinitionResolver;
     adapter?: SearchAdapter;
     defaultFacets?: string[];
 }

package/dist/modules/search/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/search/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAkB,MAAM,gCAAgC,CAAC;AACxF,OAAO,KAAK,EACV,aAAa,EAGb,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB,UAAU,iBAAiB;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAuCD,qBAAa,aAAa;IACZ,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,iBAAiB;YAE7B,gBAAgB;YAwBhB,YAAY;YAwBZ,aAAa;YAyCb,YAAY;IAY1B,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,aAAa;IAgDf,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAcpE,KAAK,CACT,MAAM,EAAE,iBAAiB,EACzB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IA+D/B,OAAO,CACX,MAAM,EAAE,mBAAmB,EAC3B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;CAoC7B"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/search/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,aAAa,EAGb,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAG3E,UAAU,iBAAiB;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACtC,6BAA6B,CAAC,EAAE,6BAA6B,CAAC;IAC9D,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAoDD,qBAAa,aAAa;IACZ,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,iBAAiB;YAE7B,gBAAgB;YAwBhB,YAAY;YAwBZ,aAAa;YAuEb,YAAY;IAoB1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,aAAa;IAoEf,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAcpE,KAAK,CACT,MAAM,EAAE,iBAAiB,EACzB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IA8F/B,OAAO,CACX,MAAM,EAAE,mBAAmB,EAC3B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;CA+C7B"}

package/dist/modules/search/service.js

@@ -1,5 +1,7 @@
-import { Ok } from "../../kernel/result.js";
-import { resolveOrgId } from "../../auth/org.js";
+import { Err, Ok } from "../../kernel/result.js";
+import { resolveOrgIdForCommerce } from "../../auth/org.js";
+import { OrgResolutionError } from "../../kernel/errors.js";
+import { canReadUnpublishedCatalog } from "../catalog/read-policy.js";
 function unique(values) {
     return [...new Set(values)];
 }
@@ -19,6 +21,22 @@ function includesAllTokens(haystack, tokens) {
     const lower = haystack.toLowerCase();
     return tokens.every((token) => lower.includes(token));
 }
+function customFieldValue(field) {
+    if (field.textValue != null)
+        return field.textValue;
+    if (field.numberValue != null)
+        return String(field.numberValue);
+    if (field.booleanValue != null)
+        return String(field.booleanValue);
+    if (field.dateValue != null)
+        return field.dateValue.toISOString();
+    return undefined;
+}
+function attributeValues(value) {
+    if (value == null)
+        return [];
+    return Array.isArray(value) ? value : [value];
+}
 function scoreText(document, tokens) {
     if (tokens.length === 0)
         return 1;
@@ -55,44 +73,80 @@ export class SearchService {
         return unique(slugs);
     }
     async buildDocument(entity, ctx) {
-        const attributes = await this.deps.catalogRepository.findAttributesByEntityId(entity.id, ctx);
-        const primary = attributes[0];
+        const localizedAttributes = await this.deps.catalogRepository.findAttributesByEntityId(entity.id, ctx);
+        const primary = localizedAttributes[0];
         const title = primary?.title ?? entity.slug;
         const description = primary?.description;
         const categories = await this.entityCategories(entity.id, ctx);
         const brands = await this.entityBrands(entity.id, ctx);
+        const definitions = this.deps.resolveEntityFieldDefinitions
+            ? await this.deps.resolveEntityFieldDefinitions(entity.type, entity.organizationId, ctx)
+            : (this.deps.entities?.[entity.type]?.fields ?? []);
+        const filterableFields = new Set(definitions
+            .filter((field) => field.filterable === true)
+            .map((field) => field.name));
+        const customFields = await this.deps.catalogRepository.findCustomFieldsByEntityId(entity.id, ctx);
+        const attributeValuesByName = new Map();
+        for (const field of customFields) {
+            if (field.locale !== "en" || !filterableFields.has(field.fieldName))
+                continue;
+            const value = customFieldValue(field);
+            if (value == null)
+                continue;
+            const values = attributeValuesByName.get(field.fieldName) ?? [];
+            if (!values.includes(value))
+                values.push(value);
+            attributeValuesByName.set(field.fieldName, values);
+        }
+        const attributes = Object.fromEntries([...attributeValuesByName.entries()].map(([name, values]) => [
+            name,
+            values.length === 1 ? values[0] : values,
+        ]));
         const textParts = [
             entity.slug,
             title,
             description ?? "",
             ...categories,
             ...brands,
-            ...attributes.map((attr) => attr.title),
-            ...attributes.map((attr) => attr.description ?? ""),
+            ...localizedAttributes.map((attr) => attr.title),
+            ...localizedAttributes.map((attr) => attr.description ?? ""),
         ];
         return {
             id: entity.id,
+            organizationId: entity.organizationId,
             type: entity.type,
             slug: entity.slug,
             title,
             ...(description ? { description } : {}),
             status: entity.status,
+            isVisible: entity.isVisible,
             categories,
             brands,
             text: textParts.join(" ").trim(),
+            ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
             payload: {
                 metadata: entity.metadata ?? undefined,
             },
         };
     }
     async allDocuments(ctx) {
-        const orgId = resolveOrgId(ctx?.actor ?? null);
-        const entities = await this.deps.catalogRepository.findEntities(orgId, undefined, ctx);
+        const actor = ctx?.actor;
+        if (!actor) {
+            // Deliberate exception: this needs an authenticated actor, not merely a
+            // resolvable organization, because visibility scoping is decided from the
+            // actor's permissions. A declared deployment default would satisfy the
+            // organization but not that.
+            throw new OrgResolutionError("Organization could not be resolved for a search read.");
+        }
+        const orgId = resolveOrgIdForCommerce(actor, this.deps.config);
+        const entities = await this.deps.catalogRepository.findEntities(orgId, canReadUnpublishedCatalog(actor) ? undefined : { status: "active", isVisible: true }, ctx);
         return Promise.all(entities.map((entity) => this.buildDocument(entity, ctx)));
     }
     matchesFilters(document, filters) {
         if (!filters)
             return true;
+        if (filters.organizationId && document.organizationId !== filters.organizationId)
+            return false;
         if (filters.type && document.type !== filters.type)
             return false;
         if (filters.status && document.status !== filters.status)
@@ -101,6 +155,12 @@ export class SearchService {
             return false;
         if (filters.brand && !document.brands.includes(filters.brand))
             return false;
+        for (const [name, requested] of Object.entries(filters.attributes ?? {})) {
+            const actual = attributeValues(document.attributes?.[name]);
+            const expected = attributeValues(requested);
+            if (!expected.some((value) => actual.includes(value)))
+                return false;
+        }
         return true;
     }
     computeFacets(documents, requested) {
@@ -138,6 +198,24 @@ export class SearchService {
                     }
                 }
             }
+            const attributeName = facet.startsWith("attributes.")
+                ? facet.slice("attributes.".length)
+                : facet;
+            if (attributeName !== "type" &&
+                attributeName !== "status" &&
+                attributeName !== "category" &&
+                attributeName !== "categories" &&
+                attributeName !== "brand" &&
+                attributeName !== "brands") {
+                const values = {};
+                for (const document of documents) {
+                    for (const value of new Set(attributeValues(document.attributes?.[attributeName]))) {
+                        values[value] = (values[value] ?? 0) + 1;
+                    }
+                }
+                if (Object.keys(values).length > 0)
+                    output[attributeName] = values;
+            }
         }
         return output;
     }
@@ -156,17 +234,46 @@ export class SearchService {
         // Cap query length to prevent abuse / excessive processing
         const safeQuery = (params.query ?? "").slice(0, 500);
         if (this.deps.adapter) {
-            return this.deps.adapter.search({
+            const actor = ctx?.actor ?? null;
+            // Deliberate exception: this needs an authenticated actor, not merely a
+            // resolvable organization, because visibility scoping is decided from the
+            // actor's permissions. A declared deployment default would satisfy the
+            // organization but not that.
+            if (!actor)
+                return Err(new OrgResolutionError("Organization could not be resolved for a search read."));
+            const organizationId = resolveOrgIdForCommerce(actor, this.deps.config);
+            const result = await this.deps.adapter.search({
                 ...params,
                 query: safeQuery,
                 page,
                 limit,
+                filters: {
+                    ...params.filters,
+                    organizationId,
+                    ...(!canReadUnpublishedCatalog(actor) ? { status: "active" } : {}),
+                },
+            });
+            if (!result.ok)
+                return result;
+            const hits = result.value.hits.filter((hit) => hit.document.organizationId === organizationId &&
+                (canReadUnpublishedCatalog(actor) ||
+                    (hit.document.status === "active" && hit.document.isVisible !== false)));
+            return Ok({
+                ...result.value,
+                hits,
+                total: hits.length,
+                facets: this.computeFacets(hits.map((hit) => hit.document), params.facets),
             });
         }
         // In-memory fallback: require a non-empty query to avoid loading all entities
         // (allDocuments triggers N+1 DB queries per entity — unsafe at scale)
         const tokens = tokenize(safeQuery);
-        if (tokens.length === 0 && !params.filters?.type && !params.filters?.category && !params.filters?.brand && !params.filters?.status) {
+        if (tokens.length === 0 &&
+            !params.filters?.type &&
+            !params.filters?.category &&
+            !params.filters?.brand &&
+            !params.filters?.status &&
+            Object.keys(params.filters?.attributes ?? {}).length === 0) {
             return Ok({ hits: [], total: 0, page, limit, facets: {} });
         }
         try {
@@ -215,11 +322,24 @@ export class SearchService {
         if (prefix.length === 0)
             return Ok([]);
         if (this.deps.adapter) {
-            return this.deps.adapter.suggest({
+            const actor = ctx?.actor ?? null;
+            // Deliberate exception: this needs an authenticated actor, not merely a
+            // resolvable organization, because visibility scoping is decided from the
+            // actor's permissions. A declared deployment default would satisfy the
+            // organization but not that.
+            if (!actor)
+                return Err(new OrgResolutionError("Organization could not be resolved for a search read."));
+            const organizationId = resolveOrgIdForCommerce(actor, this.deps.config);
+            const result = await this.deps.adapter.suggest({
                 ...params,
                 prefix,
                 limit,
+                organizationId,
             });
+            if (!result.ok)
+                return result;
+            const visibleTitles = new Set((await this.allDocuments(ctx)).map((document) => document.title));
+            return Ok(result.value.filter((title) => visibleTitles.has(title)));
         }
         // In-memory fallback: require prefix >= 2 chars to avoid loading all entities
         // (allDocuments triggers N+1 DB queries per entity — unsafe at scale)

package/dist/modules/settings/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAO,MAAM,cAAc;mBACR,OAAO,aAAa;0CAUrC,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/module.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAO,MAAM,cAAc;mBACR,OAAO,aAAa;0CAWrC,CAAC"}

package/dist/modules/settings/module.js

@@ -7,5 +7,6 @@ export const settingsModule = defineModule({
     schema: () => ({ storeSettings }),
     service: (deps) => new SettingsService({
         repository: new SettingsRepository(deps.db.db),
+        config: deps.config,
     }),
 });

package/dist/modules/settings/service.d.ts

@@ -1,9 +1,11 @@
 import type { Actor } from "../../auth/types.js";
+import type { CommerceConfig } from "../../config/types.js";
 import type { TxContext } from "../../kernel/database/tx-context.js";
 import { type Result } from "../../kernel/result.js";
 import type { SettingsRepository } from "./repository/index.js";
 interface SettingsServiceDeps {
     repository: SettingsRepository;
+    config: CommerceConfig;
 }
 /**
  * Org-scoped runtime settings (issue #49).
@@ -14,6 +16,7 @@ interface SettingsServiceDeps {
  */
 export declare class SettingsService {
     private repository;
+    private config;
     constructor(deps: SettingsServiceDeps);
     /** Runtime read for plugins/hooks. Unset groups read as `{}`. */
     read(orgId: string, group: string, ctx?: TxContext): Promise<Record<string, unknown>>;

package/dist/modules/settings/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,UAAU,mBAAmB;IAC3B,UAAU,EAAE,kBAAkB,CAAC;CAChC;AAED;;;;;;GAMG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAqB;gBAE3B,IAAI,EAAE,mBAAmB;IAIrC,iEAAiE;IAC3D,IAAI,CACR,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAK7B,QAAQ,CACZ,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAKrC,MAAM,CACV,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAQ3D,wEAAwE;IAClE,WAAW,CACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAkB5C"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,UAAU,mBAAmB;IAC3B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,cAAc,CAAC;CACxB;AAED;;;;;;GAMG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,MAAM,CAAiB;gBAEnB,IAAI,EAAE,mBAAmB;IAKrC,iEAAiE;IAC3D,IAAI,CACR,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAK7B,QAAQ,CACZ,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAKrC,MAAM,CACV,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAQ3D,wEAAwE;IAClE,WAAW,CACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAkB5C"}